Commit 999e5db6 authored by "Steven J. Hill"'s avatar "Steven J. Hill"
Browse files

Make sure to install the 'libgthread' shared libraries as well. Also, allow... 

Make sure to install the 'libgthread' shared libraries as well. Also, allow for configuration of locale support or not.
parent d67d790d

package/libglib2/Config.in

+9 −2
Original line number Diff line number Diff line 
config BR2_PACKAGE_LIBGLIB2

	bool "libglib2"

	default n

	select BR2_ENABLE_LOCALE

	select BR2_PACKAGE_LIBINTL

	help

	  Low-level core library that forms the basis of GTK+ and GNOME.



	  http://www.gtk.org/



config BR2_PACKAGE_LIBGLIB2_LOCALE

	bool "libglib2-locale"

	default n

	select BR2_ENABLE_LOCALE

	select BR2_PACKAGE_LIBINTL

	select BR2_PACKAGE_PKGCONFIG

	help

	  Enable locale support for Glib library.

package/libglib2/libglib2.mk

+11 −1
Original line number Diff line number Diff line
@@ -138,15 +138,25 @@ $(TARGET_DIR)/lib/libglib-2.0.so.0.1200.6: $(STAGING_DIR)/lib/$(LIBGLIB2_BINARY) 
	cp -a $(STAGING_DIR)/lib/libgmodule-2.0.so.0* $(TARGET_DIR)/lib/

	cp -a $(STAGING_DIR)/lib/libgobject-2.0.so $(TARGET_DIR)/lib/

	cp -a $(STAGING_DIR)/lib/libgobject-2.0.so.0* $(TARGET_DIR)/lib/

	cp -a $(STAGING_DIR)/lib/libgthread-2.0.so $(TARGET_DIR)/lib/

	cp -a $(STAGING_DIR)/lib/libgthread-2.0.so.0* $(TARGET_DIR)/lib/

	$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libglib-2.0.so.0.*

	$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libgmodule-2.0.so.0.*

	$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libgobject-2.0.so.0.*

	$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libgthread-2.0.so.0.*

	touch -c $(TARGET_DIR)/lib/libglib-2.0.so.0.1200.6



ifeq ($(strip $(BR2_PACKAGE_LIBGLIB2_LOCAL)),y)

libglib2: uclibc gettext libintl pkgconfig $(TARGET_DIR)/lib/libglib-2.0.so.0.1200.6

else

libglib2: uclibc $(TARGET_DIR)/lib/libglib-2.0.so.0.1200.6

endif



libglib2-clean:

	rm -f $(TARGET_DIR)/lib/$(LIBGLIB2_BINARY)

	rm -f $(TARGET_DIR)/usr/lib/libglib-2.0*

	rm -f $(TARGET_DIR)/usr/lib/libgmodule-2.0*

	rm -f $(TARGET_DIR)/usr/lib/libgobject-2.0*

	rm -f $(TARGET_DIR)/usr/lib/libgthread-2.0*

	-$(MAKE) -C $(LIBGLIB2_DIR) clean



libglib2-dirclean: