| 1 |
commit: 46b44c2c2080582ca5c48925651ca385c233ffb8 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 7 10:53:35 2021 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 7 10:53:35 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=46b44c2c |
| 7 |
|
| 8 |
scripts/bootstrap-prefix.sh: fix errors recently introduced |
| 9 |
|
| 10 |
./bootstrap-prefix.sh: line 1652: local: `ROOT/etc/portage/make.conf/': not a valid identifier |
| 11 |
|
| 12 |
the assignment doesn't quite like it to be broken up like this, don't |
| 13 |
know quite yet, but at least this fixes it |
| 14 |
|
| 15 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 16 |
|
| 17 |
scripts/bootstrap-prefix.sh | 6 +++--- |
| 18 |
1 file changed, 3 insertions(+), 3 deletions(-) |
| 19 |
|
| 20 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
| 21 |
index 04a6ef37b1..ccbe9ef905 100755 |
| 22 |
--- a/scripts/bootstrap-prefix.sh |
| 23 |
+++ b/scripts/bootstrap-prefix.sh |
| 24 |
@@ -1648,12 +1648,12 @@ do_emerge_pkgs() { |
| 25 |
clang |
| 26 |
internal-glib |
| 27 |
) |
| 28 |
- local override_make_conf_dir=\ |
| 29 |
- "${PORTAGE_OVERRIDE_EPREFIX}${MAKE_CONF_DIR#${ROOT}}" |
| 30 |
+ local override_make_conf_dir="${PORTAGE_OVERRIDE_EPREFIX}${MAKE_CONF_DIR#${ROOT}}" |
| 31 |
|
| 32 |
if [[ " ${USE} " == *" prefix-stack "* ]] && |
| 33 |
[[ ${PORTAGE_OVERRIDE_EPREFIX} == */tmp ]] && |
| 34 |
- ! grep -Rq '^USE=".*" # by bootstrap-prefix.sh$' "${override_make_conf_dir}" |
| 35 |
+ ! grep -Rq '^USE=".*" # by bootstrap-prefix.sh$' \ |
| 36 |
+ "${override_make_conf_dir}" |
| 37 |
then |
| 38 |
# With prefix-stack, the USE env var does apply to the stacked |
| 39 |
# prefix only, not the base prefix (any more? since some portage |
Archives