| 1 |
commit: 94efbc6a0e731f2d6eab66ed4cbcceb46514f34c |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 2 10:46:08 2021 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 2 10:46:08 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=94efbc6a |
| 7 |
|
| 8 |
scripts/bootstrap-prefix: drop obsolete target stuff |
| 9 |
|
| 10 |
mostly AIX, Interix and IRIX bits, also drop obsoleted Solaris and |
| 11 |
Darwin versions bits |
| 12 |
|
| 13 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 14 |
|
| 15 |
scripts/bootstrap-prefix.sh | 122 +++----------------------------------------- |
| 16 |
1 file changed, 7 insertions(+), 115 deletions(-) |
| 17 |
|
| 18 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
| 19 |
index b9f225be71..d453ef7e35 100755 |
| 20 |
--- a/scripts/bootstrap-prefix.sh |
| 21 |
+++ b/scripts/bootstrap-prefix.sh |
| 22 |
@@ -102,16 +102,10 @@ configure_cflags() { |
| 23 |
*-darwin*) |
| 24 |
export LDFLAGS="-Wl,-search_paths_first -L${ROOT}/tmp/usr/lib" |
| 25 |
;; |
| 26 |
- *-solaris* | *-irix*) |
| 27 |
+ *-solaris*) |
| 28 |
export LDFLAGS="-L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib" |
| 29 |
;; |
| 30 |
- *-*-aix*) |
| 31 |
- # The bootstrap compiler unlikely has runtime linking |
| 32 |
- # enabled already, but elibtoolize switches to the |
| 33 |
- # "lib.so(shr.o)" sharedlib variant. |
| 34 |
- export LDFLAGS="-Wl,-brtl -L${ROOT}/tmp/usr/lib" |
| 35 |
- ;; |
| 36 |
- i586-pc-interix* | i586-pc-winnt* | *-pc-cygwin*) |
| 37 |
+ i586-pc-winnt* | *-pc-cygwin*) |
| 38 |
export LDFLAGS="-L${ROOT}/tmp/usr/lib" |
| 39 |
;; |
| 40 |
*) |
| 41 |
@@ -283,9 +277,6 @@ configure_toolchain() { |
| 42 |
*) export NM="$(type -P nm) -p" ;; # Solaris nm |
| 43 |
esac |
| 44 |
;; |
| 45 |
- *-*-aix*) |
| 46 |
- linker=sys-devel/native-cctools |
| 47 |
- ;; |
| 48 |
esac |
| 49 |
} |
| 50 |
|
| 51 |
@@ -353,26 +344,15 @@ bootstrap_setup() { |
| 52 |
fi |
| 53 |
|
| 54 |
case ${CHOST} in |
| 55 |
- powerpc-apple-darwin7) |
| 56 |
- profile="prefix/darwin/macos/10.3" |
| 57 |
- ;; |
| 58 |
- powerpc-apple-darwin[89]) |
| 59 |
+ powerpc-apple-darwin9) |
| 60 |
rev=${CHOST##*darwin} |
| 61 |
profile="prefix/darwin/macos/10.$((rev - 4))/ppc" |
| 62 |
;; |
| 63 |
- powerpc64-apple-darwin[89]) |
| 64 |
- rev=${CHOST##*darwin} |
| 65 |
- profile="prefix/darwin/macos/10.$((rev - 4))/ppc64" |
| 66 |
- ;; |
| 67 |
- i*86-apple-darwin[89]) |
| 68 |
- rev=${CHOST##*darwin} |
| 69 |
- profile="prefix/darwin/macos/10.$((rev - 4))/x86" |
| 70 |
- ;; |
| 71 |
- i*86-apple-darwin1[012345678]) |
| 72 |
+ i*86-apple-darwin1[578]) |
| 73 |
rev=${CHOST##*darwin} |
| 74 |
profile="prefix/darwin/macos/10.$((rev - 4))/x86" |
| 75 |
;; |
| 76 |
- x86_64-apple-darwin9|x86_64-apple-darwin1[0123456789]) |
| 77 |
+ x86_64-apple-darwin1[5789]) |
| 78 |
rev=${CHOST##*darwin} |
| 79 |
profile="prefix/darwin/macos/10.$((rev - 4))/x64" |
| 80 |
;; |
| 81 |
@@ -392,9 +372,6 @@ bootstrap_setup() { |
| 82 |
profile=${profile_linux/ARCH/amd64} |
| 83 |
profile=${profile/17.0/17.1/no-multilib} |
| 84 |
;; |
| 85 |
- ia64-pc-linux-gnu) |
| 86 |
- profile=${profile_linux/ARCH/ia64} |
| 87 |
- ;; |
| 88 |
powerpc-unknown-linux-gnu) |
| 89 |
profile=${profile_linux/ARCH/ppc} |
| 90 |
;; |
| 91 |
@@ -410,24 +387,6 @@ bootstrap_setup() { |
| 92 |
armv7l-pc-linux-gnu) |
| 93 |
profile=${profile_linux/ARCH/arm} |
| 94 |
;; |
| 95 |
- sparc-sun-solaris2.9) |
| 96 |
- profile="prefix/sunos/solaris/5.9/sparc" |
| 97 |
- ;; |
| 98 |
- sparcv9-sun-solaris2.9) |
| 99 |
- profile="prefix/sunos/solaris/5.9/sparc64" |
| 100 |
- ;; |
| 101 |
- i386-pc-solaris2.10) |
| 102 |
- profile="prefix/sunos/solaris/5.10/x86" |
| 103 |
- ;; |
| 104 |
- x86_64-pc-solaris2.10) |
| 105 |
- profile="prefix/sunos/solaris/5.10/x64" |
| 106 |
- ;; |
| 107 |
- sparc-sun-solaris2.10) |
| 108 |
- profile="prefix/sunos/solaris/5.10/sparc" |
| 109 |
- ;; |
| 110 |
- sparcv9-sun-solaris2.10) |
| 111 |
- profile="prefix/sunos/solaris/5.10/sparc64" |
| 112 |
- ;; |
| 113 |
i386-pc-solaris2.11) |
| 114 |
profile="prefix/sunos/solaris/5.11/x86" |
| 115 |
;; |
| 116 |
@@ -440,18 +399,9 @@ bootstrap_setup() { |
| 117 |
sparcv9-sun-solaris2.11) |
| 118 |
profile="prefix/sunos/solaris/5.11/sparc64" |
| 119 |
;; |
| 120 |
- powerpc-ibm-aix*) |
| 121 |
- profile="prefix/aix/${CHOST#powerpc-ibm-aix}/ppc" |
| 122 |
- ;; |
| 123 |
- i586-pc-interix*) |
| 124 |
- profile="prefix/windows/interix/${CHOST#i586-pc-interix}/x86" |
| 125 |
- ;; |
| 126 |
i586-pc-winnt*) |
| 127 |
profile="prefix/windows/winnt/${CHOST#i586-pc-winnt}/x86" |
| 128 |
;; |
| 129 |
- i686-pc-cygwin*) |
| 130 |
- profile="prefix/windows/cygwin/x86" |
| 131 |
- ;; |
| 132 |
x86_64-pc-cygwin*) |
| 133 |
profile="prefix/windows/cygwin/x64" |
| 134 |
;; |
| 135 |
@@ -885,19 +835,8 @@ bootstrap_gnu() { |
| 136 |
# Solaris 11 has a messed up prce installation. We don't need |
| 137 |
# it anyway, so just disable it |
| 138 |
myconf="${myconf} --disable-perl-regexp" |
| 139 |
- # Except interix really needs it for grep. |
| 140 |
- [[ $CHOST == *interix* ]] && myconf="${myconf} --disable-nls" |
| 141 |
- fi |
| 142 |
- |
| 143 |
- # AIX doesn't like --enable-nls in general during bootstrap |
| 144 |
- [[ $CHOST == *-aix* ]] && myconf="${myconf} --disable-nls" |
| 145 |
- # AIX 7.1 has fstatat(), but broken without APAR IV23716: |
| 146 |
- [[ $CHOST == *-aix7* ]] && export ac_cv_func_fstatat=no |
| 147 |
- # AIX lacks /dev/fd/*, bash uses (blocking) named pipes instead |
| 148 |
- [[ ${PN} == "bash" ]] && sed -i -e 's/|O_NONBLOCK//' subst.c |
| 149 |
- # but portage's multijob needs more unique pipe names |
| 150 |
- [[ ${PN},${CHOST} == bash,*-aix* ]] && |
| 151 |
- export CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-DUSE_MKTEMP" |
| 152 |
+ fi |
| 153 |
+ |
| 154 |
# pod2man may be too old (not understanding --utf8) but we don't |
| 155 |
# care about manpages at this stage |
| 156 |
export ac_cv_path_POD2MAN=no |
| 157 |
@@ -1075,11 +1014,6 @@ bootstrap_python() { |
| 158 |
esac |
| 159 |
|
| 160 |
case $CHOST in |
| 161 |
- *-*-aix*) |
| 162 |
- # Python stubbornly insists on using cc_r to compile. We |
| 163 |
- # know better, so force it to listen to us |
| 164 |
- myconf="${myconf} --with-gcc=yes" |
| 165 |
- ;; |
| 166 |
*-*-cygwin*) |
| 167 |
# --disable-shared would link modules against "python.exe" |
| 168 |
# so renaming to "pythonX.Y.exe" will break them. |
| 169 |
@@ -1274,14 +1208,6 @@ bootstrap_zlib_core() { |
| 170 |
rm -Rf "${x}" |
| 171 |
done |
| 172 |
|
| 173 |
- if [[ ${CHOST} == *-aix* ]]; then |
| 174 |
- # No aix-soname support, but symlinks when built with gcc. This breaks |
| 175 |
- # later on when aix-soname is added within Prefix, where the lib.so.1 |
| 176 |
- # is an archive then, while finding this one first due to possible |
| 177 |
- # rpath ordering issues. |
| 178 |
- rm -f "${ROOT}"/tmp/usr/lib/libz.so.1 |
| 179 |
- fi |
| 180 |
- |
| 181 |
einfo "${A%-*} bootstrapped" |
| 182 |
} |
| 183 |
|
| 184 |
@@ -1497,16 +1423,6 @@ bootstrap_stage1() { |
| 185 |
# be identified as stage1-installed like in bug #615410. |
| 186 |
mkdir -p "${ROOT}"/tmp/usr/local/bin |
| 187 |
case ${CHOST} in |
| 188 |
- *-*-aix*) |
| 189 |
- # sys-devel/native-cctools installs the wrapper below, |
| 190 |
- # but we need it early or gmp breaks |
| 191 |
- { |
| 192 |
- echo '#!/bin/sh' |
| 193 |
- echo 'test ${#TMPDIR} -le 85 || TMPDIR=/tmp export TMPDIR' |
| 194 |
- echo 'exec /usr/ccs/bin/nm ${1+"$@"}' |
| 195 |
- } > "${ROOT}"/tmp/usr/local/bin/nm |
| 196 |
- chmod 755 "${ROOT}"/tmp/usr/local/bin/nm |
| 197 |
- ;; |
| 198 |
*-darwin*) |
| 199 |
# Recent Mac OS X have a nice popup to install java when |
| 200 |
# it's called without being installed, this doesn't stop the |
| 201 |
@@ -1787,7 +1703,6 @@ bootstrap_stage2() { |
| 202 |
sys-devel/gnuconfig |
| 203 |
sys-apps/gentoo-functions |
| 204 |
app-portage/elt-patches |
| 205 |
- $([[ ${CHOST} == *-aix* ]] && echo dev-libs/libiconv ) # bash dependency |
| 206 |
$([[ ${CHOST} == *-cygwin* ]] && echo dev-libs/libiconv ) # bash dependency |
| 207 |
sys-libs/ncurses |
| 208 |
sys-libs/readline |
| 209 |
@@ -2573,7 +2488,6 @@ EOF |
| 210 |
*-freebsd*) ncpu=$(/sbin/sysctl -n hw.ncpu) ;; |
| 211 |
*-solaris*) ncpu=$(/usr/sbin/psrinfo | wc -l) ;; |
| 212 |
*-linux-gnu*) ncpu=$(cat /proc/cpuinfo | grep processor | wc -l) ;; |
| 213 |
- *-aix*) ncpu=$(/usr/sbin/bindprocessor -q | cut -d: -f2 | wc -w) ;; |
| 214 |
*) ncpu=1 ;; |
| 215 |
esac |
| 216 |
# get rid of excess spaces (at least Solaris wc does) |
| 217 |
@@ -3088,20 +3002,6 @@ if [[ -z ${CHOST} ]]; then |
| 218 |
;; |
| 219 |
esac |
| 220 |
;; |
| 221 |
- AIX) |
| 222 |
- # GNU coreutils uname sucks, it doesn't know what |
| 223 |
- # processor it is using on AIX. We mimick GNU CHOST |
| 224 |
- # guessing here, instead of what IBM uses itself. |
| 225 |
- CHOST="`/usr/bin/uname -p`-ibm-aix`oslevel`" |
| 226 |
- ;; |
| 227 |
- Interix) |
| 228 |
- case `uname -m` in |
| 229 |
- x86) CHOST="i586-pc-interix`uname -r`" ;; |
| 230 |
- *) eerror "Can't deal with interix `uname -m` (yet)" |
| 231 |
- exit 1 |
| 232 |
- ;; |
| 233 |
- esac |
| 234 |
- ;; |
| 235 |
CYGWIN*) |
| 236 |
CHOST="`uname -m`-pc-cygwin" |
| 237 |
;; |
| 238 |
@@ -3133,14 +3033,6 @@ case ${CHOST} in |
| 239 |
MAKE=make |
| 240 |
fi |
| 241 |
;; |
| 242 |
- *-sgi-irix*) |
| 243 |
- MAKE=gmake |
| 244 |
- ;; |
| 245 |
- *-aix*) |
| 246 |
- MAKE=make |
| 247 |
- # We do run in bash here, no? It is ways faster than /bin/sh. |
| 248 |
- : ${CONFIG_SHELL:=${BASH}} |
| 249 |
- ;; |
| 250 |
*) |
| 251 |
MAKE=make |
| 252 |
;; |
Archives