From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 15733158094 for ; Wed, 29 Jun 2022 16:28:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2F6FEE0BA2; Wed, 29 Jun 2022 16:28:16 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E84D9E0BA2 for ; Wed, 29 Jun 2022 16:28:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 90D08341A64 for ; Wed, 29 Jun 2022 16:28:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E8D3A51D for ; Wed, 29 Jun 2022 16:28:11 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1656520084.16089d5cef7ce3a9f636f22fdd9b2a0dbb373322.sam@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/bootstrap-prefix.sh X-VCS-Directories: scripts/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 16089d5cef7ce3a9f636f22fdd9b2a0dbb373322 X-VCS-Branch: master Date: Wed, 29 Jun 2022 16:28:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: db5b109d-b27b-4bcd-bde3-d87db2d0a8f1 X-Archives-Hash: 925c5fbccd0b9a818cc834f5f314e2ea commit: 16089d5cef7ce3a9f636f22fdd9b2a0dbb373322 Author: Anna Vyalkova sysrq in> AuthorDate: Sat Jun 4 04:22:13 2022 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jun 29 16:28:04 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=16089d5c scripts/bootstrap-prefix.sh: fix bash build on OpenBSD SYS_BASHRC must be a string, not a multi-character constant. https://lists.gnu.org/archive/html/bug-bash/2022-06/msg00015.html Signed-off-by: Anna Vyalkova sysrq.in> Signed-off-by: Sam James gentoo.org> scripts/bootstrap-prefix.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index f14872f6d5..1ab204b0e9 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -959,8 +959,9 @@ bootstrap_gnu() { # contain cruft, bug #650284 [[ ${PN} == "bash" ]] && \ export CPPFLAGS="${CPPFLAGS} \ - -DSYS_BASHRC=\'\"${ROOT}/etc/bash/bashrc\"\' \ - -DSYS_BASH_LOGOUT=\'\"${ROOT}/etc/bash/bash_logout\"\'" + -DSYS_BASHRC=\\\"${ROOT}/etc/bash/bashrc\\\" \ + -DSYS_BASH_LOGOUT=\\\"${ROOT}/etc/bash/bash_logout\\\" \ + " # Don't do ACL stuff on Darwin, especially Darwin9 will make # coreutils completely useless (install failing on everything)