NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gdk-pixbuf: fix dependency on libiconv

Browse Source 
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Lionel Landwerlin 2010-12-09 10:54:59 +01:00 committed by Peter Korsgaard
parent cc37a07f28
commit 3b8d36c351
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -3,8 +3,8 @@
Ccache support reworked. Now used for both host and target Ccache support reworked. Now used for both host and target
compilation, and cache is stored in ~/.buildroot-ccache. compilation, and cache is stored in ~/.buildroot-ccache.
Updated/fixed packages: busybox, cloop, libconfig, m4, Updated/fixed packages: busybox, cloop, gdk-pixbuf, libconfig,
openssh, openssl, qt, usbutils, xz, zlib m4, openssh, openssl, qt, usbutils, xz, zlib
New packages: dhrystone, lsuio, rsh-redone, whetstone New packages: dhrystone, lsuio, rsh-redone, whetstone

1
package/gdk-pixbuf/Config.in
View File

@ -4,6 +4,7 @@ config BR2_PACKAGE_GDK_PIXBUF
select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
help help
Gdk-Pixbuf is an image loader and scaler. It uses GObject Gdk-Pixbuf is an image loader and scaler. It uses GObject

5
package/gdk-pixbuf/gdk-pixbuf.mk
View File

@ -38,7 +38,10 @@ else
GDK_PIXBUF_DEPENDENCIES += tiff GDK_PIXBUF_DEPENDENCIES += tiff
endif 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 define GDK_PIXBUF_POST_INSTALL_TWEAKS
$(INSTALL) -m 755 package/gdk-pixbuf/S26gdk-pixbuf $(TARGET_DIR)/etc/init.d/ $(INSTALL) -m 755 package/gdk-pixbuf/S26gdk-pixbuf $(TARGET_DIR)/etc/init.d/