[gentoo-commits] repo/gentoo:master commit in: app-crypt/gnupg/

["James Le Cuirot" <chewi@gentoo.org>]

commit:     ff8d9f188ee04d7cb0737e55b6e917cf569679de
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 24 23:08:53 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 23:08:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff8d9f18

app-crypt/gnupg: Fix cross-compiling by using gpgrt-config

It appears to be a reimplementation of pkg-config in Bash. It even uses the
SYSROOT properly without setting any environment variables, seemingly by basing
paths on where it was executed from. As such, using the build host's
gpgrt-config doesn't work. npth 1.7 is needed to cross-compile successfully but
older versions work for native builds.

Closes: https://bugs.gentoo.org/914711
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 app-crypt/gnupg/gnupg-2.4.4-r1.ebuild | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app-crypt/gnupg/gnupg-2.4.4-r1.ebuild b/app-crypt/gnupg/gnupg-2.4.4-r1.ebuild
index 768489c6bf9f..1bbfa46c8115 100644
--- a/app-crypt/gnupg/gnupg-2.4.4-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.4.4-r1.ebuild
@@ -132,11 +132,7 @@ my_src_configure() {
 		--enable-large-secmem
 
 		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
-		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
-		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
-		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
+		ac_cv_path_GPGRT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpgrt-config"
 
 		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
 	)