Commit 3b8d36c3 authored by Lionel Landwerlin's avatar Lionel Landwerlin Committed by Peter Korsgaard
Browse files

gdk-pixbuf: fix dependency on libiconv 



Signed-off-by: default avatarLionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent cc37a07f

CHANGES

+2 −2
Original line number Diff line number Diff line
@@ -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

package/gdk-pixbuf/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -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

package/gdk-pixbuf/gdk-pixbuf.mk

+4 −1
Original line number Diff line number Diff line
@@ -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/