Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/
Date: Fri, 31 May 2019 14:35:01
Message-Id: 1559313261.d095e517c36eda7dd2954d914a9d577c455c7566.grobian@gentoo
1 commit: d095e517c36eda7dd2954d914a9d577c455c7566
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 31 14:34:21 2019 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Fri May 31 14:34:21 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d095e517
7
8 scripts/bootstrap-prefix: add workaround for Darwin9 in bootstrap_python
9
10 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
11
12 scripts/bootstrap-prefix.sh | 28 ++++++++++++++++------------
13 1 file changed, 16 insertions(+), 12 deletions(-)
14
15 diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
16 index 23b3ec412c..d5bfd04ca8 100755
17 --- a/scripts/bootstrap-prefix.sh
18 +++ b/scripts/bootstrap-prefix.sh
19 @@ -945,18 +945,6 @@ bootstrap_python() {
20 patch -p0 < "${DISTDIR}"/python-3.6-02_all_disable_modules_and_ssl.patch
21 fi
22
23 - # Solaris' host compiler (if old -- 3.4.3) doesn't grok HUGE_VAL,
24 - # and barfs on isnan() so patch it out
25 - case ${CHOST} in
26 - (*-solaris*)
27 - sed -i \
28 - -e '/^#define Py_HUGE_VAL/s/HUGE_VAL$/(__builtin_huge_val())/' \
29 - -e '/defined HAVE_DECL_ISNAN/s/ISNAN/USE_FALLBACK/' \
30 - Include/pymath.h
31 - ;;
32 - esac
33 -
34 -
35 case ${CHOST} in
36 (*-*-cygwin*)
37 # apply patches from cygwinports much like the ebuild does
38 @@ -983,6 +971,22 @@ bootstrap_python() {
39 done
40 done
41 ;;
42 + (*-solaris*)
43 + # Solaris' host compiler (if old -- 3.4.3) doesn't grok HUGE_VAL,
44 + # and barfs on isnan() so patch it out
45 + sed -i \
46 + -e '/^#define Py_HUGE_VAL/s/HUGE_VAL$/(__builtin_huge_val())/' \
47 + -e '/defined HAVE_DECL_ISNAN/s/ISNAN/USE_FALLBACK/' \
48 + Include/pymath.h
49 + ;;
50 + (*-darwin9)
51 + # Darwin 9's kqueue seems to act up (at least at this stage), so
52 + # make Python's selectors resort to poll() or select() for the
53 + # time being
54 + sed -i \
55 + -e 's/KQUEUE/KQUEUE_DISABLED/' \
56 + configure
57 + ;;
58 esac
59
60 local myconf=""