summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2009-03-17 13:49:12 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2009-03-17 13:49:12 +0000
commit44d929f9acbcee9cee1a116f456d99f4d8e4e208 (patch)
treeb2826bb4f9fdce8bda0e3072a9abe514407e0dc5
parent0612973e5ea51b918e102d2ff7ad09b614213431 (diff)
libglib2: pkgconfig patch no longer needed as we have HOST_DIR in path
-rw-r--r--package/libglib2/libglib2-pkgconfig-cc.patch27
-rw-r--r--package/libglib2/libglib2.mk5
2 files changed, 0 insertions, 32 deletions
diff --git a/package/libglib2/libglib2-pkgconfig-cc.patch b/package/libglib2/libglib2-pkgconfig-cc.patch
deleted file mode 100644
index 44e236fa3..000000000
--- a/package/libglib2/libglib2-pkgconfig-cc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-glib2: prefix glib binaries in pkgconfig file with BIN_DIR
-
-Make sure the host versions of the glib binaries are used.
----
- glib-2.0.pc.in | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-Index: glib-2.18.4/glib-2.0.pc.in
-===================================================================
---- glib-2.18.4.orig/glib-2.0.pc.in
-+++ glib-2.18.4/glib-2.0.pc.in
-@@ -1,11 +1,12 @@
-+BIN_DIR=
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
-
--glib_genmarshal=glib-genmarshal
--gobject_query=gobject-query
--glib_mkenums=glib-mkenums
-+glib_genmarshal=${BIN_DIR}glib-genmarshal
-+gobject_query=$(BIN_DIR}gobject-query
-+glib_mkenums=${BIN_DIR}glib-mkenums
-
- Name: GLib
- Description: C Utility Library
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 8adc060d0..50dc06816 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -64,11 +64,6 @@ endif
$(eval $(call AUTOTARGETS,package,libglib2))
-$(LIBGLIB2_HOOK_POST_INSTALL): $(LIBGLIB2_TARGET_INSTALL_STAGING)
- $(SED) 's~^BIN_DIR=.*~BIN_DIR=$(HOST_DIR)/usr/bin/~' \
- $(STAGING_DIR)/usr/lib/pkgconfig/glib-2.0.pc
- touch $@
-
# libglib2 for the host
LIBGLIB2_HOST_DIR:=$(BUILD_DIR)/libglib2-$(LIBGLIB2_VERSION)-host
LIBGLIB2_HOST_BINARY:=$(HOST_DIR)/usr/bin/glib-genmarshal