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 A1391158094 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 37A2CE0BA6; Wed, 29 Jun 2022 16:28:16 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DED2FE0BA6 for ; Wed, 29 Jun 2022 16:28:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C2537341A52 for ; Wed, 29 Jun 2022 16:28:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 08D4051E for ; Wed, 29 Jun 2022 16:28:12 +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.507f08372cb0fb882be36712f81111658591722a.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: 507f08372cb0fb882be36712f81111658591722a X-VCS-Branch: master Date: Wed, 29 Jun 2022 16:28:12 +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: cf955741-a479-4c23-abdc-b88dd3fd2a21 X-Archives-Hash: 1566d1041af02655833b34070ff7c736 commit: 507f08372cb0fb882be36712f81111658591722a Author: Anna Vyalkova sysrq in> AuthorDate: Sat Jun 4 04:22:54 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=507f0837 scripts/bootstrap-prefix.sh: fix Python build on OpenBSD Signed-off-by: Anna Vyalkova sysrq.in> Signed-off-by: Sam James gentoo.org> scripts/bootstrap-prefix.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 1ab204b0e9..629fb6e3b3 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1109,6 +1109,13 @@ bootstrap_python() { -e "/Unexpected output of 'arch' on OSX/d" \ configure ;; + (*-openbsd*) + # OpenBSD is not a multilib system + sed -i \ + -e '0,/#if defined(__ANDROID__)/{s/ANDROID/OpenBSD/}' \ + -e '0,/MULTIARCH=/{s/\(MULTIARCH\)=.*/\1=""/}' \ + configure + ;; esac case ${CHOST} in @@ -1165,6 +1172,10 @@ bootstrap_python() { LDFLAGS="${LDFLAGS} -Wl,-rpath,${ROOT}/tmp/usr/lib ${libdir}" LDFLAGS="${LDFLAGS} -Wl,-rpath,${libdir#-L}" ;; + *-openbsd*) + # LLD + LDFLAGS="${LDFLAGS} -Wl,-rpath,${ROOT}/tmp/usr/lib" + ;; *-solaris*) # Sun ld LDFLAGS="${LDFLAGS} -R${ROOT}/tmp/usr/lib ${libdir}"