Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/
Date: Wed, 06 Mar 2019 11:16:33
Message-Id: 1551870978.83f06a22d04e760b1509b8dd042fae4a26c1562a.grobian@gentoo
1 commit: 83f06a22d04e760b1509b8dd042fae4a26c1562a
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 6 11:13:55 2019 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 6 11:16:18 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=83f06a22
7
8 scripts/bootstrap-prefix: allow usage of pre-set USE-flags
9
10 in bootstrap_setup, record requested USE-flags in make.conf such that
11 for example we can fairly cleanly and painless bootstrap a USE=libressl
12 prefix.
13
14 Verified with i386-pc-solaris2.11/20190305
15
16 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
17
18 scripts/bootstrap-prefix.sh | 4 +++-
19 1 file changed, 3 insertions(+), 1 deletion(-)
20
21 diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
22 index 1520bee986..6b76007f86 100755
23 --- a/scripts/bootstrap-prefix.sh
24 +++ b/scripts/bootstrap-prefix.sh
25 @@ -357,8 +357,10 @@ bootstrap_setup() {
26 echo "# Avoid problems due to case-insensitivity, bug #524236"
27 echo 'FEATURES="${FEATURES} case-insensitive-fs"'
28 fi
29 - [[ -n $PORTDIR_OVERLAY ]] && \
30 + [[ -n ${PORTDIR_OVERLAY} ]] && \
31 echo "PORTDIR_OVERLAY=\"\${PORTDIR_OVERLAY} ${PORTDIR_OVERLAY}\""
32 + [[ -n ${MAKE_CONF_ADDITIONAL_USE} ]] &&
33 + echo "USE=\"\${USE} ${MAKE_CONF_ADDITIONAL_USE}\""
34 [[ ${OFFLINE_MODE} ]] && \
35 echo 'FETCHCOMMAND="bash -c \"echo I need \${FILE} from \${URI} in \${DISTDIR}; read\""'
36 } > "${ROOT}"/etc/portage/make.conf