bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@7198 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2007-05-13 09:03:59 +00:00
parent 5cc6a3f241
commit 4e5b40d3fe
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libs/glib2/Makefile
View File

@ -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

13
libs/glib2/patches/001-no_glib_marshal.patch Normal file
View File

@ -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