Gentoo Archives: gentoo-commits

From: Benda XU <heroxbd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/
Date: Mon, 11 Dec 2017 05:22:11
Message-Id: 1512966264.35e720f2898f90e5741698ec349fd03a84a67b29.heroxbd@gentoo
1 commit: 35e720f2898f90e5741698ec349fd03a84a67b29
2 Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 11 04:24:24 2017 +0000
4 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 11 04:24:24 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=35e720f2
7
8 bootstrap-prefix.sh: kiss goodbye IRIX, HPUX and BSD.
9
10 You have been served us well. Lead a happy life after retire.
11 The corresponding profiles have already been removed.
12
13 scripts/bootstrap-prefix.sh | 130 +-------------------------------------------
14 1 file changed, 2 insertions(+), 128 deletions(-)
15
16 diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
17 index 06227ad812..e9542d3ed6 100755
18 --- a/scripts/bootstrap-prefix.sh
19 +++ b/scripts/bootstrap-prefix.sh
20 @@ -114,9 +114,6 @@ configure_cflags() {
21 *-solaris* | *-irix*)
22 export LDFLAGS="-L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib"
23 ;;
24 - *-hp-hpux*)
25 - export LDFLAGS="-L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib -L/usr/local/lib -R/usr/local/lib"
26 - ;;
27 *-*-aix*)
28 # The bootstrap compiler unlikely has runtime linking
29 # enabled already, but elibtoolize switches to the
30 @@ -409,9 +406,6 @@ bootstrap_setup() {
31 powerpc-ibm-aix*)
32 profile="prefix/aix/${CHOST#powerpc-ibm-aix}/ppc"
33 ;;
34 - mips-sgi-irix*)
35 - profile="prefix/irix/${CHOST#mips-sgi-irix}/mips"
36 - ;;
37 i586-pc-interix*)
38 profile="prefix/windows/interix/${CHOST#i586-pc-interix}/x86"
39 ;;
40 @@ -424,33 +418,6 @@ bootstrap_setup() {
41 x86_64-pc-cygwin*)
42 profile="prefix/windows/cygwin/x64"
43 ;;
44 - hppa64*-hp-hpux11*)
45 - profile="prefix/hpux/B.11${CHOST#hppa*-hpux11}/hppa64"
46 - ;;
47 - hppa2.0*-hp-hpux11*)
48 - profile="prefix/hpux/B.11${CHOST#hppa*-hpux11}/hppa2.0"
49 - ;;
50 - ia64-hp-hpux11*)
51 - profile="prefix/hpux/B.11${CHOST#ia64-hp-hpux11}/ia64"
52 - ;;
53 - i386-pc-freebsd*)
54 - profile="prefix/bsd/freebsd/${CHOST#i386-pc-freebsd}/x86"
55 - ;;
56 - x86_64-pc-freebsd*)
57 - profile="prefix/bsd/freebsd/${CHOST#x86_64-pc-freebsd}/x64"
58 - ;;
59 - i386-pc-netbsd*)
60 - profile="prefix/bsd/netbsd/${CHOST#i386-pc-netbsdelf}/x86"
61 - ;;
62 - powerpc-unknown-openbsd*)
63 - profile="prefix/bsd/openbsd/${CHOST#powerpc-unknown-openbsd}/ppc"
64 - ;;
65 - i386-pc-openbsd*)
66 - profile="prefix/bsd/openbsd/${CHOST#i386-pc-openbsd}/x86"
67 - ;;
68 - x86_64-pc-openbsd*)
69 - profile="prefix/bsd/openbsd/${CHOST#x86_64-pc-openbsd}/x64"
70 - ;;
71 *)
72 eerror "UNKNOWN ARCH: You need to set up a make.profile symlink to a"
73 eerror "profile in ${PORTDIR} for your CHOST ${CHOST}"
74 @@ -720,9 +687,6 @@ bootstrap_gnu() {
75 [[ ${PN},${CHOST} == bash,*-aix* ]] &&
76 export CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-DUSE_MKTEMP"
77
78 - # NetBSD has strange openssl headers, which make wget fail.
79 - [[ $CHOST == *-netbsd* ]] && myconf="${myconf} --disable-ntlm"
80 -
81 # Darwin9 in particular doesn't compile when using system readline,
82 # but we don't need any groovy input at all, so just disable it
83 [[ ${PN} == "bash" ]] && myconf="${myconf} --disable-readline"
84 @@ -734,11 +698,6 @@ bootstrap_gnu() {
85 [[ ${PN} == "coreutils" ]] && \
86 myconf="${myconf} --disable-acl --without-gmp"
87
88 - if [[ ${PN} == "tar" && ${CHOST} == *-hpux* ]] ; then
89 - # Fix a compilation error due to a missing definition
90 - export CPPFLAGS="${CPPFLAGS} -DCHAR_BIT=8"
91 - fi
92 -
93 # Gentoo Bug 400831, fails on Ubuntu with libssl-dev installed
94 [[ ${PN} == "wget" ]] && myconf="${myconf} --without-ssl"
95
96 @@ -887,9 +846,6 @@ EOP
97 # And ctypes dynamically loads "libpythonX.Y.dll" anyway.
98 myconf="${myconf} --enable-shared"
99 ;;
100 - *-openbsd*)
101 - CFLAGS="${CFLAGS} -D_BSD_SOURCE=1"
102 - ;;
103 *-linux*)
104 # Bug 382263: make sure Python will know about the libdir in use for
105 # the current arch
106 @@ -908,7 +864,7 @@ EOP
107 export LDFLAGS="${CFLAGS} -L${ROOT}/tmp/usr/lib -L${ROOT}/tmp/usr/lib64"
108 # set correct flags for runtime for ELF platforms
109 case $CHOST in
110 - *-*bsd*|*-linux*)
111 + *-linux*)
112 # GNU ld
113 export LDFLAGS="${LDFLAGS} -Wl,-rpath,${ROOT}/tmp/usr/lib ${libdir}"
114 ;;
115 @@ -1066,12 +1022,11 @@ bootstrap_grep() {
116 }
117
118 bootstrap_coreutils() {
119 - # 8.12 for FreeBSD 9.1, bug #415439
120 # 8.16 is the last version released as tar.gz
121 # 8.18 is necessary for macOS High Sierra (darwin17) and converted
122 # to tar.gz for this case
123 bootstrap_gnu coreutils 8.28 || bootstrap_gnu coreutils 8.16 || \
124 - bootstrap_gnu coreutils 8.17 || bootstrap_gnu coreutils 8.12
125 + bootstrap_gnu coreutils 8.17
126 }
127
128 bootstrap_tar() {
129 @@ -2127,11 +2082,9 @@ EOF
130 case "${CHOST}" in
131 *-cygwin*) ncpu=$(cmd /D /Q /C 'echo %NUMBER_OF_PROCESSORS%' | tr -d "\\r") ;;
132 *-darwin*) ncpu=$(/usr/sbin/sysctl -n hw.ncpu) ;;
133 - *-freebsd*) ncpu=$(/sbin/sysctl -n hw.ncpu) ;;
134 *-solaris*) ncpu=$(/usr/sbin/psrinfo | wc -l) ;;
135 *-linux-gnu*) ncpu=$(cat /proc/cpuinfo | grep processor | wc -l) ;;
136 *-aix*) ncpu=$(/usr/sbin/bindprocessor -q | cut -d: -f2 | wc -w) ;;
137 - *-hpux*) ncpu=$(/sbin/ioscan -kC processor | grep -c processor) ;;
138 *) ncpu=1 ;;
139 esac
140 # get rid of excess spaces (at least Solaris wc does)
141 @@ -2591,9 +2544,6 @@ if [[ -z ${CHOST} ]]; then
142 # guessing here, instead of what IBM uses itself.
143 CHOST="`/usr/bin/uname -p`-ibm-aix`oslevel`"
144 ;;
145 - IRIX|IRIX64)
146 - CHOST="mips-sgi-irix`uname -r`"
147 - ;;
148 Interix)
149 case `uname -m` in
150 x86) CHOST="i586-pc-interix`uname -r`" ;;
151 @@ -2605,82 +2555,6 @@ if [[ -z ${CHOST} ]]; then
152 CYGWIN*)
153 CHOST="`uname -m`-pc-cygwin"
154 ;;
155 - HP-UX)
156 - case `uname -m` in
157 - ia64) HP_ARCH=ia64 ;;
158 - 9000/[678][0-9][0-9])
159 - if [ ! -x /usr/bin/getconf ]; then
160 - eerror "Need /usr/bin/getconf to determine cpu"
161 - exit 1
162 - fi
163 - # from config.guess
164 - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
165 - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
166 - case "${sc_cpu_version}" in
167 - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
168 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
169 - 532) # CPU_PA_RISC2_0
170 - case "${sc_kernel_bits}" in
171 - 32) HP_ARCH="hppa2.0n" ;;
172 - 64) HP_ARCH="hppa2.0w" ;;
173 - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
174 - esac ;;
175 - esac
176 - ;;
177 - esac
178 - uname_r=`uname -r`
179 - if [ -z "${HP_ARCH}" ]; then
180 - error "Cannot determine cpu/kernel type"
181 - exit ;
182 - fi
183 - CHOST="${HP_ARCH}-hp-hpux${uname_r#B.}"
184 - unset HP_ARCH uname_r
185 - ;;
186 - FreeBSD)
187 - case `uname -p` in
188 - i386)
189 - CHOST="i386-pc-freebsd`uname -r | sed 's|-.*$||'`"
190 - ;;
191 - amd64)
192 - CHOST="x86_64-pc-freebsd`uname -r | sed 's|-.*$||'`"
193 - ;;
194 - sparc64)
195 - CHOST="sparc64-unknown-freebsd`uname -r | sed 's|-.*$||'`"
196 - ;;
197 - *)
198 - eerror "Sorry, don't know about FreeBSD on `uname -p` yet"
199 - exit 1
200 - ;;
201 - esac
202 - ;;
203 - NetBSD)
204 - case `uname -p` in
205 - i386)
206 - CHOST="`uname -p`-pc-netbsdelf`uname -r`"
207 - ;;
208 - *)
209 - eerror "Sorry, don't know about NetBSD on `uname -p` yet"
210 - exit 1
211 - ;;
212 - esac
213 - ;;
214 - OpenBSD)
215 - case `uname -m` in
216 - macppc)
217 - CHOST="powerpc-unknown-openbsd`uname -r`"
218 - ;;
219 - i386)
220 - CHOST="i386-pc-openbsd`uname -r`"
221 - ;;
222 - amd64)
223 - CHOST="x86_64-pc-openbsd`uname -r`"
224 - ;;
225 - *)
226 - eerror "Sorry, don't know about OpenBSD on `uname -m` yet"
227 - exit 1
228 - ;;
229 - esac
230 - ;;
231 *)
232 eerror "Nothing known about platform `uname -s`."
233 eerror "Please set CHOST appropriately for your system"