libglib2: pkgconfig patch no longer needed as we have HOST_DIR in path
This commit is contained in:
parent
0612973e5e
commit
44d929f9ac
@ -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
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user