app-crypt/gnupg: support cross-compile + multilib

Signed-off-by: Alon Bar-Lev <alonbl@gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

diff --git a/app-crypt/gnupg/gnupg-2.2.10-r2.ebuild b/app-crypt/gnupg/gnupg-2.2.10-r2.ebuild
index 2bf51b3eec859225ec912b861496bb8d6667bac1..9e198106fa36e117d48ae27ce633bcb95187b95d 100644 (file)
--- a/app-crypt/gnupg/gnupg-2.2.10-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.10-r2.ebuild
@@ -93,7 +93,12 @@ src_configure() {
                --enable-gpgsm \
                --enable-large-secmem \
                CC_FOR_BUILD="$(tc-getBUILD_CC)" \
-               $(./configure --help | grep -- --with-.*-prefix | sed -e 's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#")
+               GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
+               KSBA_CONFIG="${EROOT}/usr/bin/ksba-config" \
+               LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config" \
+               LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \
+               NPTH_CONFIG="${EROOT}/usr/bin/npth-config" \
+               $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
 }
 
 src_compile() {