Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/
Date: Wed, 29 Jun 2022 16:28:17
Message-Id: 1656520084.16089d5cef7ce3a9f636f22fdd9b2a0dbb373322.sam@gentoo
1 commit: 16089d5cef7ce3a9f636f22fdd9b2a0dbb373322
2 Author: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
3 AuthorDate: Sat Jun 4 04:22:13 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 29 16:28:04 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=16089d5c
7
8 scripts/bootstrap-prefix.sh: fix bash build on OpenBSD
9
10 SYS_BASHRC must be a string, not a multi-character constant.
11 https://lists.gnu.org/archive/html/bug-bash/2022-06/msg00015.html
12
13 Signed-off-by: Anna Vyalkova <cyber+gentoo <AT> sysrq.in>
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 scripts/bootstrap-prefix.sh | 5 +++--
17 1 file changed, 3 insertions(+), 2 deletions(-)
18
19 diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
20 index f14872f6d5..1ab204b0e9 100755
21 --- a/scripts/bootstrap-prefix.sh
22 +++ b/scripts/bootstrap-prefix.sh
23 @@ -959,8 +959,9 @@ bootstrap_gnu() {
24 # contain cruft, bug #650284
25 [[ ${PN} == "bash" ]] && \
26 export CPPFLAGS="${CPPFLAGS} \
27 - -DSYS_BASHRC=\'\"${ROOT}/etc/bash/bashrc\"\' \
28 - -DSYS_BASH_LOGOUT=\'\"${ROOT}/etc/bash/bash_logout\"\'"
29 + -DSYS_BASHRC=\\\"${ROOT}/etc/bash/bashrc\\\" \
30 + -DSYS_BASH_LOGOUT=\\\"${ROOT}/etc/bash/bash_logout\\\" \
31 + "
32
33 # Don't do ACL stuff on Darwin, especially Darwin9 will make
34 # coreutils completely useless (install failing on everything)