summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2019-03-07 14:41:28 +0100
committerFabian Groffen <grobian@gentoo.org>2019-03-07 14:43:03 +0100
commit3dba87d0ba4def5d4306baed53ef5341ad7f314e (patch)
treeae9edb343fc0023af5587309860c0574b9a4db8a
parentscripts/bootstrap-prefix: set libdir for python install (diff)
downloadprefix-3dba87d0.tar.gz
prefix-3dba87d0.tar.bz2
prefix-3dba87d0.zip
scripts/bootstrap-prefix: avoid errors for every emerge
etc/portage may not exist, so ensure it is created, and don't assume make.conf exists in it Signed-off-by: Fabian Groffen <grobian@gentoo.org>
-rwxr-xr-xscripts/bootstrap-prefix.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index da6017f1bd..d014d9dbb2 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1489,7 +1489,9 @@ do_emerge_pkgs() {
;;
esac
done
- sed -i -e '/#stage3_temp#/d' "${EPREFIX}"/tmp/etc/portage/make.conf
+ mkdir -p "${EPREFIX}"/tmp/etc/portage
+ [[ -e "${EPREFIX}"/tmp/etc/portage/make.conf ]] && \
+ sed -i -e '/#stage3_temp#/d' "${EPREFIX}"/tmp/etc/portage/make.conf
{
echo "CFLAGS=\"\${CFLAGS} ${OVERRIDE_CFLAGS}\" #stage3_temp#"
echo "CXXFLAGS=\"\${CXXFLAGS} ${OVERRIDE_CXXFLAGS}\" #stage3_temp#"