Fix libglib2 build when LIBICONV is selected, clean up versioning (d597e790) · Commits · Dom Sekotill / buildroot

package/libglib2/libglib2.mk

+10 −2

Original line number	Diff line number	Diff line
		@@ -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))