summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author"Steven J. Hill" <sjhill@realitydiluted.com>2007-01-14 01:02:36 +0000
committer"Steven J. Hill" <sjhill@realitydiluted.com>2007-01-14 01:02:36 +0000
commit999e5db6d55643590b3b414590441abce89dc111 (patch)
treed177a72299d22c79dfc3649a71d7e05c1304c472
parentd67d790dd17b8a0e13aabed13f302cfde9cc3057 (diff)
Make sure to install the 'libgthread' shared libraries as well. Also, allow for configuration of locale support or not.
-rw-r--r--package/libglib2/Config.in11
-rw-r--r--package/libglib2/libglib2.mk12
2 files changed, 20 insertions, 3 deletions
diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in
index 2f7028689..c327d8ab2 100644
--- a/package/libglib2/Config.in
+++ b/package/libglib2/Config.in
@@ -1,9 +1,16 @@
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.
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 8742613b8..a2b26253b 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -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: