Skip to contentSkip to conversation

package/libglib2: remove bindir prefix from gio-2.0.pc

PATCH New Fabrice Fontaine 2 participants 2 messages Jun 13, 2019 – Jun 17, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/libglib2: remove bindir prefix from gio-2.0.pc

Apply LIBGLIB2_REMOVE_BINDIR_PREFIX_FROM_PC_FILE to gio-2.0.pc so ${bindir} prefix is also removed for gbus-codegen otherwise build of packages using this binary will fail if gbus-codegen is not installed on host

Fixes:
- http://autobuild.buildroot.org/results/5c0e4f3d33e01198688d58388aabe159bd005234

---
Changes v1 -> v2 (after review of Yann E. Morin and Carlos Santos):
- Drop shell loop and use addprefix

 package/libglib2/libglib2.mk | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
package/libglib2/libglib2.mk +7 -6
index 78d6e5ab32..207352fa37 100644
@@ -85,13 +85,14 @@ endef
 
 LIBGLIB2_POST_INSTALL_TARGET_HOOKS += LIBGLIB2_REMOVE_DEV_FILES
 
-# Newer versions of libglib2 prefix glib-genmarshal, gobject-query, and
-# glib-mkenums with ${bindir}. Unfortunately, this will resolve to the host
-# systems /bin/ directory, which will cause compilation issues if the host does
-# not have these programs. By removing the ${bindir}/ prefix, these programs
-# are resolved in PATH instead.
+# Newer versions of libglib2 prefix glib-genmarshal, gobject-query,
+# glib-mkenums, glib_compile_schemas, glib_compile_resources and gdbus-codegen
+# with ${bindir}. Unfortunately, this will resolve to the host systems /bin/
+# directory, which will cause compilation issues if the host does not have these
+# programs. By removing the ${bindir}/ prefix, these programs are resolved in
+# PATH instead.
 define LIBGLIB2_REMOVE_BINDIR_PREFIX_FROM_PC_FILE
-	$(SED) 's%$${bindir}/%%g' $(STAGING_DIR)/usr/lib/pkgconfig/glib-2.0.pc
+	$(SED) 's%$${bindir}/%%g' $(addprefix $(STAGING_DIR)/usr/lib/pkgconfig/, glib-2.0.pc gio-2.0.pc)
 endef
 LIBGLIB2_POST_INSTALL_TARGET_HOOKS += LIBGLIB2_REMOVE_BINDIR_PREFIX_FROM_PC_FILE
 
Signature · 1 line
2.20.1
#1 lore raw

PATCH v2 1/1 package/libglib2: remove bindir prefix from gio-2.0.pc

Quoted 5 lines · On Thu, 13 Jun 2019 21:17:55 +0200 Fabrice Fontaine…

Apply LIBGLIB2_REMOVE_BINDIR_PREFIX_FROM_PC_FILE to gio-2.0.pc so ${bindir} prefix is also removed for gbus-codegen otherwise build of packages using this binary will fail if gbus-codegen is not installed on host

Quoted 7 lines

Fixes:
- http://autobuild.buildroot.org/results/5c0e4f3d33e01198688d58388aabe159bd005234

---
Changes v1 -> v2 (after review of Yann E. Morin and Carlos Santos):
- Drop shell loop and use addprefix

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com