| 1 |
commit: 131a48fda39fb846922d0e521695b5e5a77f4fb4 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 5 13:46:44 2021 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 5 13:46:44 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=131a48fd |
| 7 |
|
| 8 |
scripts/bootstrap-prefix: use MAKE_CONF_DIR where possible |
| 9 |
|
| 10 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 11 |
|
| 12 |
scripts/bootstrap-prefix.sh | 4 ++-- |
| 13 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
| 16 |
index e372fb21da..04a6ef37b1 100755 |
| 17 |
--- a/scripts/bootstrap-prefix.sh |
| 18 |
+++ b/scripts/bootstrap-prefix.sh |
| 19 |
@@ -310,7 +310,7 @@ bootstrap_setup() { |
| 20 |
rm "${ROOT}"/FOO.$$ |
| 21 |
|
| 22 |
[[ ! -e "${MAKE_CONF_DIR}" ]] && mkdir -p -- "${MAKE_CONF_DIR}" |
| 23 |
- if [[ ! -f ${ROOT}/etc/portage/make.conf/0100_bootstrap_prefix_make.conf ]] ; then |
| 24 |
+ if [[ ! -f ${MAKE_CONF_DIR}/0100_bootstrap_prefix_make.conf ]] ; then |
| 25 |
{ |
| 26 |
echo "# Added by bootstrap-prefix.sh for ${CHOST}" |
| 27 |
echo 'USE="unicode nls"' |
| 28 |
@@ -1649,7 +1649,7 @@ do_emerge_pkgs() { |
| 29 |
internal-glib |
| 30 |
) |
| 31 |
local override_make_conf_dir=\ |
| 32 |
- "${PORTAGE_OVERRIDE_EPREFIX}/etc/portage/make.conf/" |
| 33 |
+ "${PORTAGE_OVERRIDE_EPREFIX}${MAKE_CONF_DIR#${ROOT}}" |
| 34 |
|
| 35 |
if [[ " ${USE} " == *" prefix-stack "* ]] && |
| 36 |
[[ ${PORTAGE_OVERRIDE_EPREFIX} == */tmp ]] && |
Archives