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: Fri, 08 Jul 2016 11:17:40
Message-Id: 1467875375.3bb409b3eba0c8d3c4dfc33e5066a7fb4e24339a.grobian@gentoo
1 commit: 3bb409b3eba0c8d3c4dfc33e5066a7fb4e24339a
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 7 07:09:35 2016 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 7 07:09:35 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3bb409b3
7
8 scripts/bootstrap-prefix: only disable sandbox on RAP
9
10 scripts/bootstrap-prefix.sh | 6 ++++--
11 1 file changed, 4 insertions(+), 2 deletions(-)
12
13 diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
14 index e05c81a..22987e0 100755
15 --- a/scripts/bootstrap-prefix.sh
16 +++ b/scripts/bootstrap-prefix.sh
17 @@ -232,8 +232,10 @@ bootstrap_setup() {
18 echo 'CXXFLAGS="${CFLAGS}"'
19 echo "MAKEOPTS=\"${MAKEOPTS}\""
20 echo "CONFIG_SHELL=\"${ROOT}/bin/bash\""
21 - echo "# sandbox does not work well on Prefix, bug 490246"
22 - echo 'FEATURES="-usersandbox -sandbox"'
23 + if is-rap ; then
24 + echo "# sandbox does not work well on Prefix, bug 490246"
25 + echo 'FEATURES="-usersandbox -sandbox"'
26 + fi
27 if [[ !is-rap && -n ${PREFIX_DISABLE_USR_SPLIT} ]] ; then
28 echo
29 echo "# This disables /usr-split, removing this will break"