From mboxrd@z Thu Jan 1 00:00:00 1970 From: llandwerlin at gmail.com Date: Thu, 9 Dec 2010 10:54:59 +0100 Subject: [Buildroot] [PATCH 01/16] gdk-pixbuf: fix dependency on libiconv In-Reply-To: <1291888514-31385-1-git-send-email-llandwerlin@gmail.com> References: <1291888514-31385-1-git-send-email-llandwerlin@gmail.com> Message-ID: <1291888514-31385-2-git-send-email-llandwerlin@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net From: Lionel Landwerlin Signed-off-by: Lionel Landwerlin --- package/gdk-pixbuf/Config.in | 1 + package/gdk-pixbuf/gdk-pixbuf.mk | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) 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/ -- 1.7.2.3