summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Landwerlin <llandwerlin@gmail.com>2010-12-09 09:54:59 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-12-12 23:13:30 (GMT)
commit3b8d36c3518e0cb41ff2e621ca1ff4215bc553d3 (patch)
tree0576abdb0aa9b5227bb2f9fb4582c10ed483c0c8
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>
-rw-r--r--CHANGES4
-rw-r--r--package/gdk-pixbuf/Config.in1
-rw-r--r--package/gdk-pixbuf/gdk-pixbuf.mk5
3 files changed, 7 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index 7d79c27..142b654 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,8 +3,8 @@
Ccache support reworked. Now used for both host and target
compilation, and cache is stored in ~/.buildroot-ccache.
- Updated/fixed packages: busybox, cloop, libconfig, m4,
- openssh, openssl, qt, usbutils, xz, zlib
+ Updated/fixed packages: busybox, cloop, gdk-pixbuf, libconfig,
+ m4, openssh, openssl, qt, usbutils, xz, zlib
New packages: dhrystone, lsuio, rsh-redone, whetstone
diff --git a/package/gdk-pixbuf/Config.in b/package/gdk-pixbuf/Config.in
index 384f076..8b9cc3f 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 f762095..f129e46 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/