1 |
commit: d51ca86a44fd10b13db749a7945bba1573b76ff5 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 28 22:11:17 2017 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 1 08:28:43 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=d51ca86a |
7 |
|
8 |
econf: Pass --with-sysroot="${ESYSROOT:-/}" under EAPI 7 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/317337 |
11 |
|
12 |
bin/eapi.sh | 4 ++++ |
13 |
bin/phase-helpers.sh | 8 +++++++- |
14 |
2 files changed, 11 insertions(+), 1 deletion(-) |
15 |
|
16 |
diff --git a/bin/eapi.sh b/bin/eapi.sh |
17 |
index 3f4c9691b..3b6a5c1a9 100644 |
18 |
--- a/bin/eapi.sh |
19 |
+++ b/bin/eapi.sh |
20 |
@@ -178,6 +178,10 @@ ___eapi_econf_passes_--docdir_and_--htmldir() { |
21 |
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-hdepend|5-progress)$ ]] |
22 |
} |
23 |
|
24 |
+___eapi_econf_passes_--with-sysroot() { |
25 |
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$ ]] |
26 |
+} |
27 |
+ |
28 |
___eapi_use_enable_and_use_with_support_empty_third_argument() { |
29 |
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3)$ ]] |
30 |
} |
31 |
|
32 |
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh |
33 |
index 556d089b5..f6c9ef6fc 100644 |
34 |
--- a/bin/phase-helpers.sh |
35 |
+++ b/bin/phase-helpers.sh |
36 |
@@ -640,7 +640,7 @@ econf() { |
37 |
fi |
38 |
|
39 |
local conf_args=() |
40 |
- if ___eapi_econf_passes_--disable-dependency-tracking || ___eapi_econf_passes_--disable-silent-rules || ___eapi_econf_passes_--docdir_and_--htmldir; then |
41 |
+ if ___eapi_econf_passes_--disable-dependency-tracking || ___eapi_econf_passes_--disable-silent-rules || ___eapi_econf_passes_--docdir_and_--htmldir || ___eapi_econf_passes_--with-sysroot; then |
42 |
local conf_help=$("${ECONF_SOURCE}/configure" --help 2>/dev/null) |
43 |
|
44 |
if ___eapi_econf_passes_--disable-dependency-tracking; then |
45 |
@@ -664,6 +664,12 @@ econf() { |
46 |
conf_args+=( --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html ) |
47 |
fi |
48 |
fi |
49 |
+ |
50 |
+ if ___eapi_econf_passes_--with-sysroot; then |
51 |
+ if [[ ${conf_help} == *--with-sysroot* ]]; then |
52 |
+ conf_args+=( --with-sysroot="${ESYSROOT:-/}" ) |
53 |
+ fi |
54 |
+ fi |
55 |
fi |
56 |
|
57 |
# if the profile defines a location to install libs to aside from default, pass it on. |