projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cc37a07)
gdk-pixbuf: fix dependency on libiconv
authorLionel Landwerlin <llandwerlin@gmail.com>
Thu, 9 Dec 2010 09:54:59 +0000 (10:54 +0100)
committerPeter Korsgaard <jacmet@sunsite.dk>
Sun, 12 Dec 2010 23:13:30 +0000 (00:13 +0100)
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
CHANGES patch | blob | history
package/gdk-pixbuf/Config.in patch | blob | history
package/gdk-pixbuf/gdk-pixbuf.mk patch | blob | history

diff --git a/CHANGES b/CHANGES
index 7d79c27fff830970263ad48d5a648db93019332d..142b654ee963548e3a224adfa4963566269291af 100644 (file)
--- 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 384f07602e7388d526aec8eac1f21386ada4fe72..8b9cc3fb7a51942d19df5d3ecadc0c1f24ebddc5 100644 (file)
--- 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 f762095781e881496824d8de9ce7b452051422d8..f129e465d6d56ea0e2946ebe50e7ffecc1739d31 100644 (file)
--- 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/