1 |
commit: 3dba87d0ba4def5d4306baed53ef5341ad7f314e |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 7 13:41:28 2019 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 7 13:43:03 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3dba87d0 |
7 |
|
8 |
scripts/bootstrap-prefix: avoid errors for every emerge |
9 |
|
10 |
etc/portage may not exist, so ensure it is created, and don't assume |
11 |
make.conf exists in it |
12 |
|
13 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
14 |
|
15 |
scripts/bootstrap-prefix.sh | 4 +++- |
16 |
1 file changed, 3 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
19 |
index da6017f1bd..d014d9dbb2 100755 |
20 |
--- a/scripts/bootstrap-prefix.sh |
21 |
+++ b/scripts/bootstrap-prefix.sh |
22 |
@@ -1489,7 +1489,9 @@ do_emerge_pkgs() { |
23 |
;; |
24 |
esac |
25 |
done |
26 |
- sed -i -e '/#stage3_temp#/d' "${EPREFIX}"/tmp/etc/portage/make.conf |
27 |
+ mkdir -p "${EPREFIX}"/tmp/etc/portage |
28 |
+ [[ -e "${EPREFIX}"/tmp/etc/portage/make.conf ]] && \ |
29 |
+ sed -i -e '/#stage3_temp#/d' "${EPREFIX}"/tmp/etc/portage/make.conf |
30 |
{ |
31 |
echo "CFLAGS=\"\${CFLAGS} ${OVERRIDE_CFLAGS}\" #stage3_temp#" |
32 |
echo "CXXFLAGS=\"\${CXXFLAGS} ${OVERRIDE_CXXFLAGS}\" #stage3_temp#" |