commit: cfe67c6d2d4e15989aa16764a92c36e284457712 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Dec 14 15:55:15 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Dec 14 15:57:40 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfe67c6d
dev-libs/glib: fix finding just-built g-ir-scanner Without PKG_CONFIG_PATH having the just-built paths prepended, meson will find binaries from gobject-introspection on the system instead which may be: a) old (which is a problem anyway, unclear if that's guaranteed to work, and weird given we just built one), or b) too old (where gobject-introspection on the system is older than the fixed versions for bug #865183) Fix that by prepending the right paths. Bug: https://bugs.gentoo.org/865183 Closes: https://bugs.gentoo.org/946221 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/glib/glib-2.80.5.ebuild | 5 ++++- dev-libs/glib/glib-2.82.2.ebuild | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dev-libs/glib/glib-2.80.5.ebuild b/dev-libs/glib/glib-2.80.5.ebuild index 94e3af69e14d..fa2ecf79c4e2 100644 --- a/dev-libs/glib/glib-2.80.5.ebuild +++ b/dev-libs/glib/glib-2.80.5.ebuild @@ -268,7 +268,10 @@ multilib_src_configure() { export PKG_CONFIG_LIBDIR="${INTROSPECTION_LIB_DIR}/pkgconfig:${INTROSPECTION_BUILD_DIR}/meson-private" # Set the normal primary pkgconfig search paths as secondary - export PKG_CONFIG_PATH="$(pkg-config --variable pc_path pkg-config)" + # (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)" # 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.82.2.ebuild b/dev-libs/glib/glib-2.82.2.ebuild index 2e2f890300a1..5ae7e17ed0ad 100644 --- a/dev-libs/glib/glib-2.82.2.ebuild +++ b/dev-libs/glib/glib-2.82.2.ebuild @@ -268,7 +268,10 @@ multilib_src_configure() { export PKG_CONFIG_LIBDIR="${INTROSPECTION_LIB_DIR}/pkgconfig:${INTROSPECTION_BUILD_DIR}/meson-private" # Set the normal primary pkgconfig search paths as secondary - export PKG_CONFIG_PATH="$(pkg-config --variable pc_path pkg-config)" + # (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)" # 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
