From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F3E4E1581F0 for ; Sat, 14 Dec 2024 15:58:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E0202E09B7; Sat, 14 Dec 2024 15:58:15 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9B726E09BA for ; Sat, 14 Dec 2024 15:58:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8B451340DC8 for ; Sat, 14 Dec 2024 15:58:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E483090B for ; Sat, 14 Dec 2024 15:58:11 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1734191860.cfe67c6d2d4e15989aa16764a92c36e284457712.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/glib/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/glib/glib-2.80.5.ebuild dev-libs/glib/glib-2.82.2.ebuild X-VCS-Directories: dev-libs/glib/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: cfe67c6d2d4e15989aa16764a92c36e284457712 X-VCS-Branch: master Date: Sat, 14 Dec 2024 15:58:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 155c7608-2037-43ec-bf44-28e14ae165e5 X-Archives-Hash: 31f20d8de11de29fd5f791d5d4a3a5ef commit: cfe67c6d2d4e15989aa16764a92c36e284457712 Author: Sam James gentoo org> AuthorDate: Sat Dec 14 15:55:15 2024 +0000 Commit: Sam James gentoo 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 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