From: Martin Janitschke <noeoeh@web.de>
Date: Mon, 6 Aug 2007 23:10:20 +0000 (+0000)
Subject: glib2 now needs the dev package from glib 2.0 installed on the host,
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=9095418b70dc1b05e894661ffe316c7db8e46fc9;hp=143458c9d5870ff1cf232ae37b978dc7a2a510aa

glib2 now needs the dev package from glib 2.0 installed on the host,
thanks to sn9 for coming up with the problem :). nuke the patch
which hide the problem.


SVN-Revision: 8361
---

diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile
index cd0f39aa2a..321093cb3b 100644
--- a/libs/glib2/Makefile
+++ b/libs/glib2/Makefile
@@ -79,3 +79,8 @@ define Package/glib2/install
 endef
 
 $(eval $(call BuildPackage,glib2))
+
+$(eval $(call RequireCommand,glib-genmarshal, \
+	$(PKG_NAME) requires the glib2 dev (named like libglib2.0-dev, \
+	depending of your package manager) package be installed on the host-system. \
+))
diff --git a/libs/glib2/patches/001-no_glib_marshal.patch b/libs/glib2/patches/001-no_glib_marshal.patch
deleted file mode 100644
index 984a8e84dc..0000000000
--- a/libs/glib2/patches/001-no_glib_marshal.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
-