From 34da8f96141f14abd98bc4cab3fa05c0b7a0a895 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 10 Aug 2021 00:35:47 +0200 Subject: [PATCH] package/gobject-introspection: fix exec_prefix exec_prefix has been removed since version 1.66 and https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/a88b1ac548516ab25140a2e9dea8cac894bbac93 resulting in the following build failure with rygel because libgee installs Gee-0.8.gir in output/host/aarch64-buildroot-linux-gnu/sysroot/share/gir-1.0/Gee-0.8.gir instead of output/host/aarch64-buildroot-linux-gnu/sysroot/usr/share/gir-1.0/Gee-0.8.gir: Could not find GIR file 'Gee-0.8.gir'; check XDG_DATA_DIRS or use --includedir error parsing file RygelCore-2.6.gir: Failed to parse included gir Gee-0.8 If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" So replace exec_prefix by prefix Fixes: - http://autobuild.buildroot.org/results/b04b27bbb84fa6ab9a8441e7bd94aad45226dce9 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gobject-introspection/gobject-introspection.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk index fbc545b3c7..f56d0c5eff 100644 --- a/package/gobject-introspection/gobject-introspection.mk +++ b/package/gobject-introspection/gobject-introspection.mk @@ -127,11 +127,11 @@ define GOBJECT_INTROSPECTION_INSTALL_WRAPPERS # By default, girdir and typelibdir use datadir and libdir as their prefix, # of which pkg-config appends the sysroot directory. This results in files # being installed in $(STAGING_DIR)/$(STAGING_DIR)/path/to/files. - # Changing the prefix to exec_prefix prevents this error. - $(SED) "s%girdir=.*%girdir=\$${exec_prefix}/share/gir-1.0%g" \ + # Changing the prefix to prefix prevents this error. + $(SED) "s%girdir=.*%girdir=\$${prefix}/share/gir-1.0%g" \ $(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc - $(SED) "s%typelibdir=.*%typelibdir=\$${exec_prefix}/lib/girepository-1.0%g" \ + $(SED) "s%typelibdir=.*%typelibdir=\$${prefix}/lib/girepository-1.0%g" \ $(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc endef GOBJECT_INTROSPECTION_POST_INSTALL_STAGING_HOOKS += GOBJECT_INTROSPECTION_INSTALL_WRAPPERS