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.507f08372cb0fb882be36712f81111658591722a.sam@gentoo
1 commit: 507f08372cb0fb882be36712f81111658591722a
2 Author: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
3 AuthorDate: Sat Jun 4 04:22:54 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=507f0837
7
8 scripts/bootstrap-prefix.sh: fix Python build on OpenBSD
9
10 Signed-off-by: Anna Vyalkova <cyber+gentoo <AT> sysrq.in>
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 scripts/bootstrap-prefix.sh | 11 +++++++++++
14 1 file changed, 11 insertions(+)
15
16 diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
17 index 1ab204b0e9..629fb6e3b3 100755
18 --- a/scripts/bootstrap-prefix.sh
19 +++ b/scripts/bootstrap-prefix.sh
20 @@ -1109,6 +1109,13 @@ bootstrap_python() {
21 -e "/Unexpected output of 'arch' on OSX/d" \
22 configure
23 ;;
24 + (*-openbsd*)
25 + # OpenBSD is not a multilib system
26 + sed -i \
27 + -e '0,/#if defined(__ANDROID__)/{s/ANDROID/OpenBSD/}' \
28 + -e '0,/MULTIARCH=/{s/\(MULTIARCH\)=.*/\1=""/}' \
29 + configure
30 + ;;
31 esac
32
33 case ${CHOST} in
34 @@ -1165,6 +1172,10 @@ bootstrap_python() {
35 LDFLAGS="${LDFLAGS} -Wl,-rpath,${ROOT}/tmp/usr/lib ${libdir}"
36 LDFLAGS="${LDFLAGS} -Wl,-rpath,${libdir#-L}"
37 ;;
38 + *-openbsd*)
39 + # LLD
40 + LDFLAGS="${LDFLAGS} -Wl,-rpath,${ROOT}/tmp/usr/lib"
41 + ;;
42 *-solaris*)
43 # Sun ld
44 LDFLAGS="${LDFLAGS} -R${ROOT}/tmp/usr/lib ${libdir}"