aboutsummaryrefslogtreecommitdiff
path: root/package/gdk-pixbuf
diff options
context:
space:
mode:
authorGravatar Lionel Landwerlin <llandwerlin@gmail.com>2010-12-09 10:54:59 +0100
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2010-12-13 00:13:30 +0100
commit3b8d36c3518e0cb41ff2e621ca1ff4215bc553d3 (patch)
tree0576abdb0aa9b5227bb2f9fb4582c10ed483c0c8 /package/gdk-pixbuf
parentcc37a07f289f56a81195933810af705d77e95ee4 (diff)
downloadbuildroot-3b8d36c3518e0cb41ff2e621ca1ff4215bc553d3.tar.gz
buildroot-3b8d36c3518e0cb41ff2e621ca1ff4215bc553d3.tar.bz2
gdk-pixbuf: fix dependency on libiconv
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/gdk-pixbuf')
-rw-r--r--package/gdk-pixbuf/Config.in1
-rw-r--r--package/gdk-pixbuf/gdk-pixbuf.mk5
2 files changed, 5 insertions, 1 deletions
diff --git a/package/gdk-pixbuf/Config.in b/package/gdk-pixbuf/Config.in
index 384f07602e..8b9cc3fb7a 100644
--- a/package/gdk-pixbuf/Config.in
+++ b/package/gdk-pixbuf/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_GDK_PIXBUF
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
+ select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
help
Gdk-Pixbuf is an image loader and scaler. It uses GObject
diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk
index f762095781..f129e465d6 100644
--- a/package/gdk-pixbuf/gdk-pixbuf.mk
+++ b/package/gdk-pixbuf/gdk-pixbuf.mk
@@ -38,7 +38,10 @@ else
GDK_PIXBUF_DEPENDENCIES += tiff
endif
-GDK_PIXBUF_DEPENDENCIES += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config libglib2 libiconv
+GDK_PIXBUF_DEPENDENCIES += \
+ $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) \
+ $(if $(BR2_ENABLE_LOCALE),,libiconv) \
+ host-pkg-config libglib2
define GDK_PIXBUF_POST_INSTALL_TWEAKS
$(INSTALL) -m 755 package/gdk-pixbuf/S26gdk-pixbuf $(TARGET_DIR)/etc/init.d/