diff options
| author |   Sam James <sam@gentoo.org> | 2024-12-14 15:55:15 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-12-14 15:57:40 +0000 |
| commit | cfe67c6d2d4e15989aa16764a92c36e284457712 (patch) | |
| tree | 88df38103a4bf33c1c1afbbb7d3afe4be8b7856c /dev-libs/glib | |
| parent | x11-misc/xsnow: declare test dependencies (diff) | |
| download | gentoo-cfe67c6d2d4e15989aa16764a92c36e284457712.tar.gz gentoo-cfe67c6d2d4e15989aa16764a92c36e284457712.tar.bz2 gentoo-cfe67c6d2d4e15989aa16764a92c36e284457712.zip | |
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@gentoo.org>
Diffstat (limited to 'dev-libs/glib')
| -rw-r--r-- | dev-libs/glib/glib-2.80.5.ebuild | 5 | ||||
| -rw-r--r-- | 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 |