commit: c4a281bfc7e86f24205a9f0084b16045c9531a08 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Oct 26 05:05:33 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Oct 26 05:05:33 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4a281bf
dev-libs/glib: fix tests when gobject-introspection had to be bootstrapped Avoid clobbering PKG_CONFIG_LIBDIR. Closes: https://bugs.gentoo.org/963031 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/glib/glib-2.84.4.ebuild | 4 ++-- dev-libs/glib/glib-2.86.1.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-libs/glib/glib-2.84.4.ebuild b/dev-libs/glib/glib-2.84.4.ebuild index 5dcdae46a913..c4745c9ea987 100644 --- a/dev-libs/glib/glib-2.84.4.ebuild +++ b/dev-libs/glib/glib-2.84.4.ebuild @@ -306,13 +306,13 @@ multilib_src_configure() { export PATH="${INTROSPECTION_BIN_DIR}:${PATH}" # Override primary pkgconfig search paths to prioritize our internal copy - export PKG_CONFIG_LIBDIR="${INTROSPECTION_LIB_DIR}/pkgconfig:${INTROSPECTION_BUILD_DIR}/meson-private" + export PKG_CONFIG_LIBDIR="${INTROSPECTION_LIB_DIR}/pkgconfig:${INTROSPECTION_BUILD_DIR}/meson-private:${PKG_CONFIG_LIBDIR}" # Set the normal primary pkgconfig search paths as secondary # (We also need to prepend our just-built one for later use of # g-ir-scanner to use the new one and to help workaround bugs like # bug #946221.) - export PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}:$(pkg-config --variable pc_path pkg-config)" + export PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}:$($(tc-getPKG_CONFIG) --variable pc_path pkg-config)" # Add the paths to the built glib libraries to the library path so that gobject-introspection can load them for gliblib in glib gobject gthread gmodule gio girepository; do diff --git a/dev-libs/glib/glib-2.86.1.ebuild b/dev-libs/glib/glib-2.86.1.ebuild index 18950dafde84..dc64a5509ee3 100644 --- a/dev-libs/glib/glib-2.86.1.ebuild +++ b/dev-libs/glib/glib-2.86.1.ebuild @@ -306,13 +306,13 @@ multilib_src_configure() { export PATH="${INTROSPECTION_BIN_DIR}:${PATH}" # Override primary pkgconfig search paths to prioritize our internal copy - export PKG_CONFIG_LIBDIR="${INTROSPECTION_LIB_DIR}/pkgconfig:${INTROSPECTION_BUILD_DIR}/meson-private" + export PKG_CONFIG_LIBDIR="${INTROSPECTION_LIB_DIR}/pkgconfig:${INTROSPECTION_BUILD_DIR}/meson-private:${PKG_CONFIG_LIBDIR}" # Set the normal primary pkgconfig search paths as secondary # (We also need to prepend our just-built one for later use of # g-ir-scanner to use the new one and to help workaround bugs like # bug #946221.) - export PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}:$(pkg-config --variable pc_path pkg-config)" + export PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}:$($(tc-getPKG_CONFIG) --variable pc_path pkg-config)" # Add the paths to the built glib libraries to the library path so that gobject-introspection can load them for gliblib in glib gobject gthread gmodule gio girepository; do
