commit: c858ac4e4f97acc5a373e6de9191fe5e1b10e08c Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Dec 15 10:48:34 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Dec 15 10:49:49 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c858ac4e
dev-libs/glib: further fixes for using just-built gobject-introspection g-ir-scanner has some relocatable logic but it searches for 'lib', not 'lib64', so it can't find itself and eventually falls back to the system installation. Followup to cfe67c6d2d4e15989aa16764a92c36e284457712. 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 +++++ dev-libs/glib/glib-2.82.4.ebuild | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/dev-libs/glib/glib-2.80.5.ebuild b/dev-libs/glib/glib-2.80.5.ebuild index d27759baf6d3..2c8085382ed4 100644 --- a/dev-libs/glib/glib-2.80.5.ebuild +++ b/dev-libs/glib/glib-2.80.5.ebuild @@ -246,6 +246,11 @@ multilib_src_configure() { ORIG_SOURCE_DIR=${EMESON_SOURCE} EMESON_SOURCE=${INTROSPECTION_SOURCE_DIR} + # g-ir-scanner has some relocatable logic but it searches + # for 'lib', not 'lib64', so it can't find itself and eventually + # falls back to the system installation. See bug #946221. + sed -i -e "/^pylibdir =/s:'lib:'$(get_libdir):" "${EMESON_SOURCE}"/tools/g-ir-tool-template.in || die + ORIG_BUILD_DIR=${BUILD_DIR} BUILD_DIR=${INTROSPECTION_BUILD_DIR} diff --git a/dev-libs/glib/glib-2.82.2.ebuild b/dev-libs/glib/glib-2.82.2.ebuild index 16ca673a8268..533b2a2ae85d 100644 --- a/dev-libs/glib/glib-2.82.2.ebuild +++ b/dev-libs/glib/glib-2.82.2.ebuild @@ -246,6 +246,11 @@ multilib_src_configure() { ORIG_SOURCE_DIR=${EMESON_SOURCE} EMESON_SOURCE=${INTROSPECTION_SOURCE_DIR} + # g-ir-scanner has some relocatable logic but it searches + # for 'lib', not 'lib64', so it can't find itself and eventually + # falls back to the system installation. See bug #946221. + sed -i -e "/^pylibdir =/s:'lib:'$(get_libdir):" "${EMESON_SOURCE}"/tools/g-ir-tool-template.in || die + ORIG_BUILD_DIR=${BUILD_DIR} BUILD_DIR=${INTROSPECTION_BUILD_DIR} diff --git a/dev-libs/glib/glib-2.82.4.ebuild b/dev-libs/glib/glib-2.82.4.ebuild index 16ca673a8268..533b2a2ae85d 100644 --- a/dev-libs/glib/glib-2.82.4.ebuild +++ b/dev-libs/glib/glib-2.82.4.ebuild @@ -246,6 +246,11 @@ multilib_src_configure() { ORIG_SOURCE_DIR=${EMESON_SOURCE} EMESON_SOURCE=${INTROSPECTION_SOURCE_DIR} + # g-ir-scanner has some relocatable logic but it searches + # for 'lib', not 'lib64', so it can't find itself and eventually + # falls back to the system installation. See bug #946221. + sed -i -e "/^pylibdir =/s:'lib:'$(get_libdir):" "${EMESON_SOURCE}"/tools/g-ir-tool-template.in || die + ORIG_BUILD_DIR=${BUILD_DIR} BUILD_DIR=${INTROSPECTION_BUILD_DIR}
