From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 13 May 2007 09:03:59 +0000 (+0000)
Subject: Fix glib2 compilation errors when no glib2-dev package is installed on the host syste... 
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=0cf9762d73333ecda4dc3e79ae95b3f85d17eab9

Fix glib2 compilation errors when no glib2-dev package is installed on the host system (#1659)


SVN-Revision: 7198
---

diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile
index 5653b3c51f..4f0efda947 100644
--- a/libs/glib2/Makefile
+++ b/libs/glib2/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -45,31 +45,24 @@ define Build/Configure
 	)
 endef
 
-define Build/Compile	
-	$(MAKE) -C $(PKG_BUILD_DIR) \
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR)/glib \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
+		all install
 endef
 
 
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(STAGING_DIR)/usr/bin/
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/glib-2.0 $(STAGING_DIR)/usr/include/
 	mkdir -p $(STAGING_DIR)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/glib-2.0 $(STAGING_DIR)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libg* $(STAGING_DIR)/usr/lib/
-	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/g*-2.0.pc $(STAGING_DIR)/usr/lib/pkgconfig/
 endef
 
 define Build/UninstallDev
 	rm -rf \
-		$(STAGING_DIR)/usr/bin/{glib-genmarshal,glib-gettextize,glib-mkenums.gobject-query} \
 		$(STAGING_DIR)/usr/include/glib-2.0 \
-		$(STAGING_DIR)/usr/lib/{glib,libg*} \
-		$(STAGING_DIR)/usr/lib/pkgconfig/g*-2.0.pc 
+		$(STAGING_DIR)/usr/lib/libg*
 endef
 
 define Package/glib2/install	
diff --git a/libs/glib2/patches/001-no_glib_marshal.patch b/libs/glib2/patches/001-no_glib_marshal.patch
new file mode 100644
index 0000000000..984a8e84dc
--- /dev/null
+++ b/libs/glib2/patches/001-no_glib_marshal.patch
@@ -0,0 +1,13 @@
+diff -urN glib-2.12.12/configure glib-2.12.12.new/configure
+--- glib-2.12.12/configure	2007-05-02 01:20:31.000000000 +0200
++++ glib-2.12.12.new/configure	2007-05-11 09:24:21.000000000 +0200
+@@ -43081,8 +43081,7 @@
+ 
+   if test x$GLIB_GENMARSHAL = xno; then
+     { { echo "$as_me:$LINENO: error: Could not find a glib-genmarshal in your PATH" >&5
+-echo "$as_me: error: Could not find a glib-genmarshal in your PATH" >&2;}
+-   { (exit 1); exit 1; }; }
++echo "$as_me: error: Could not find a glib-genmarshal in your PATH" >&2;} }
+   fi
+ fi
+