[patch] proposed patch-r1 to omit EPREFIX from --with-sysroot

0001-EAPI-7-econf-omit-EPREFIX-from-with-sysroot.patch (text/plain), 1.12 KB, created by Michael Haubenwallner (RETIRED) on 2019-10-16 12:51:42 UTC

From 23dce711e49a991bb41b7266a544e26f04e2f8a8 Mon Sep 17 00:00:00 2001
From: Michael Haubenwallner <[e-mail]>
Date: Fri, 11 Oct 2019 10:35:52 +0200
Subject: [PATCH] EAPI 7 econf: omit EPREFIX from --with-sysroot

When some library location does start with configured sysroot value,
libtool does simply replace a leading sysroot value with =, hence
EPREFIX in --with-sysroot may erroneously strip EPREFIX from libdir.
And a single slash is wrong because libtool may access the file system
with double leading slash then, which breaks on Windows.

Bug: https://bugs.gentoo.org/697482
Signed-off-by: Michael Haubenwallner <[e-mail]>
---
 bin/phase-helpers.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index b53d39650..de81a668a 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -628,7 +628,7 @@ econf() {
 
 			if ___eapi_econf_passes_--with-sysroot; then
 				if [[ ${conf_help} == *--with-sysroot* ]]; then
-					conf_args+=( --with-sysroot="${ESYSROOT:-/}" )
+					conf_args+=( --with-sysroot="${SYSROOT%/}" )
 				fi
 			fi
 		fi
-- 
2.21.0