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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 804E8138334 for ; Fri, 31 May 2019 14:35:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 793F6E08A0; Fri, 31 May 2019 14:35:00 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5E029E08A0 for ; Fri, 31 May 2019 14:35:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 198BE3453DD for ; Fri, 31 May 2019 14:34:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C4CBB5C0 for ; Fri, 31 May 2019 14:34:56 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1559313261.d095e517c36eda7dd2954d914a9d577c455c7566.grobian@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: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: d095e517c36eda7dd2954d914a9d577c455c7566 X-VCS-Branch: master Date: Fri, 31 May 2019 14:34:56 +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: ec9c69b5-e05a-4e9f-af62-f6ffb5db7980 X-Archives-Hash: 1539c83a622c59b94864f43af67be07f commit: d095e517c36eda7dd2954d914a9d577c455c7566 Author: Fabian Groffen gentoo org> AuthorDate: Fri May 31 14:34:21 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri May 31 14:34:21 2019 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d095e517 scripts/bootstrap-prefix: add workaround for Darwin9 in bootstrap_python Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 23b3ec412c..d5bfd04ca8 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -945,18 +945,6 @@ bootstrap_python() { patch -p0 < "${DISTDIR}"/python-3.6-02_all_disable_modules_and_ssl.patch fi - # Solaris' host compiler (if old -- 3.4.3) doesn't grok HUGE_VAL, - # and barfs on isnan() so patch it out - case ${CHOST} in - (*-solaris*) - sed -i \ - -e '/^#define Py_HUGE_VAL/s/HUGE_VAL$/(__builtin_huge_val())/' \ - -e '/defined HAVE_DECL_ISNAN/s/ISNAN/USE_FALLBACK/' \ - Include/pymath.h - ;; - esac - - case ${CHOST} in (*-*-cygwin*) # apply patches from cygwinports much like the ebuild does @@ -983,6 +971,22 @@ bootstrap_python() { done done ;; + (*-solaris*) + # Solaris' host compiler (if old -- 3.4.3) doesn't grok HUGE_VAL, + # and barfs on isnan() so patch it out + sed -i \ + -e '/^#define Py_HUGE_VAL/s/HUGE_VAL$/(__builtin_huge_val())/' \ + -e '/defined HAVE_DECL_ISNAN/s/ISNAN/USE_FALLBACK/' \ + Include/pymath.h + ;; + (*-darwin9) + # Darwin 9's kqueue seems to act up (at least at this stage), so + # make Python's selectors resort to poll() or select() for the + # time being + sed -i \ + -e 's/KQUEUE/KQUEUE_DISABLED/' \ + configure + ;; esac local myconf=""