diff options
| author | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2009-01-16 21:18:08 +0000 |
|---|---|---|
| committer | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2009-01-16 21:18:08 +0000 |
| commit | d597e790bcf0d19f37aa3dfab341e4dd5182e76d (patch) | |
| tree | 0d273e45d66a4ec59037fe7a2291d2f449c7c4da | |
| parent | c90a6e7215cbd4d7955d1870eb757051efacc144 (diff) | |
Fix libglib2 build when LIBICONV is selected, clean up versioning
| -rw-r--r-- | package/libglib2/libglib2.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index defc2bdf3..c380e6ede 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -3,9 +3,12 @@ # libglib2 # ############################################################# -LIBGLIB2_VERSION = 2.16.6 +LIBGLIB2_VERSION_MAJOR = 2.16 +LIBGLIB2_VERSION_MINOR = 6 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR) LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.bz2 -LIBGLIB2_SITE = http://ftp.gtk.org/pub/glib/2.16 +LIBGLIB2_SITE = http://ftp.gtk.org/pub/glib/$(LIBGLIB2_VERSION_MAJOR) + LIBGLIB2_AUTORECONF = NO LIBGLIB2_INSTALL_STAGING = YES LIBGLIB2_INSTALL_TARGET = YES @@ -55,4 +58,9 @@ ifneq ($(BR2_ENABLE_LOCALE),y) LIBGLIB2_DEPENDENCIES+=libiconv endif +ifeq ($(BR2_PACKAGE_LIBICONV),y) +LIBGLIB2_CONF_OPT += --with-libiconv=gnu +LIBGLIB2_DEPENDENCIES+=libiconv +endif + $(eval $(call AUTOTARGETS,package,libglib2)) |