commit: 0668b7d29badbd9e74e2fe87974ff9669a11f8ae Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Oct 26 05:24:19 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Oct 26 05:36:41 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0668b7d2
dev-libs/glib: another bootstrap fix Followup to c4a281bfc7e86f24205a9f0084b16045c9531a08. This actually still doesn't seem to be enough, I must have tested w/ 2.84.4 before which didn't need bootstrapping as I had new enough g-i. Bug: https://bugs.gentoo.org/963031 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/glib/glib-2.84.4.ebuild | 2 +- dev-libs/glib/glib-2.86.1.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/glib/glib-2.84.4.ebuild b/dev-libs/glib/glib-2.84.4.ebuild index c4745c9ea987..17e1fc80ac63 100644 --- a/dev-libs/glib/glib-2.84.4.ebuild +++ b/dev-libs/glib/glib-2.84.4.ebuild @@ -306,7 +306,7 @@ 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:${PKG_CONFIG_LIBDIR}" + export PKG_CONFIG_LIBDIR="${INTROSPECTION_LIB_DIR}/pkgconfig:${INTROSPECTION_BUILD_DIR}/meson-private:$($(tc-getPKG_CONFIG) --variable pc_system_libdirs pkg-config)" # Set the normal primary pkgconfig search paths as secondary # (We also need to prepend our just-built one for later use of diff --git a/dev-libs/glib/glib-2.86.1.ebuild b/dev-libs/glib/glib-2.86.1.ebuild index dc64a5509ee3..9cfd31d4e4f5 100644 --- a/dev-libs/glib/glib-2.86.1.ebuild +++ b/dev-libs/glib/glib-2.86.1.ebuild @@ -306,7 +306,7 @@ 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:${PKG_CONFIG_LIBDIR}" + export PKG_CONFIG_LIBDIR="${INTROSPECTION_LIB_DIR}/pkgconfig:${INTROSPECTION_BUILD_DIR}/meson-private:$($(tc-getPKG_CONFIG) --variable pc_system_libdirs pkg-config)" # Set the normal primary pkgconfig search paths as secondary # (We also need to prepend our just-built one for later use of
