| 1 |
commit: ef7d323880dd0ad1e322f8debb9f4b400c580b71 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 31 02:10:00 2014 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 31 02:10:00 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/crossdev.git;a=commit;h=ef7d3238 |
| 7 |
|
| 8 |
config.site: rewrite in POSIX shell |
| 9 |
|
| 10 |
URL: https://bugs.gentoo.org/497626 |
| 11 |
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org> |
| 12 |
|
| 13 |
--- |
| 14 |
wrappers/site/config.site | 52 ++++++++++++++++++++++++----------------------- |
| 15 |
1 file changed, 27 insertions(+), 25 deletions(-) |
| 16 |
|
| 17 |
diff --git a/wrappers/site/config.site b/wrappers/site/config.site |
| 18 |
index 68cec91..1f562a9 100755 |
| 19 |
--- a/wrappers/site/config.site |
| 20 |
+++ b/wrappers/site/config.site |
| 21 |
@@ -1,50 +1,52 @@ |
| 22 |
-#!/bin/bash |
| 23 |
-# Copyright 2009 Gentoo Foundation |
| 24 |
+#!/bin/sh |
| 25 |
+# Copyright 2009-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
TOPDIR=__TOPDIR__ |
| 29 |
|
| 30 |
config_site_arch() { |
| 31 |
- local host=$(echo ${CHOST/-/ } | awk '{print $1}') |
| 32 |
+ local host="${CHOST%%-*}" |
| 33 |
|
| 34 |
- [[ ${host/arm.*eb/} != ${host} ]] && host=armeb |
| 35 |
- [[ ${host/arm/} != ${host} ]] && [[ ${host} != armeb ]] && host=arm |
| 36 |
+ case ${host} in |
| 37 |
+ arm*b*) host=armeb ;; |
| 38 |
+ arm*) host=arm ;; |
| 39 |
+ mips*l*) host=mipsel ;; |
| 40 |
+ mips*) host=mips ;; |
| 41 |
+ esac |
| 42 |
|
| 43 |
- [[ ${host/mips.*el/} != ${host} ]] && host=mipsel |
| 44 |
- |
| 45 |
- #[[ ${host/i[4-5]/6} != ${host} ]] && host=i686 |
| 46 |
- |
| 47 |
- echo ${host} |
| 48 |
+ echo "${host}" |
| 49 |
} |
| 50 |
|
| 51 |
config_site_names() { |
| 52 |
- local site_arch=$(config_site_arch) |
| 53 |
+ local site_arch="$(config_site_arch)" |
| 54 |
local sites="" |
| 55 |
local x |
| 56 |
|
| 57 |
- [[ ${CHOST/-linux-/} != $CHOST ]] && sites+=" linux ${site_arch}-linux" |
| 58 |
- [[ ${CHOST/darwin/} != $CHOST ]] && sites+=" darwin ${site_arch}-linux" |
| 59 |
- |
| 60 |
- [[ ${CHOST/-linux-uclibc/} != $CHOST ]] && sites+=" linux-uclibc ${site_arch}-linux-uclibc" |
| 61 |
- [[ ${CHOST/-linux-gnu/} != $CHOST ]] && sites+=" linux-gnu ${site_arch}-linux-gnu" |
| 62 |
+ case ${CHOST} in |
| 63 |
+ *-linux-*) sites="linux ${site_arch}-linux" ;; |
| 64 |
+ *-darwin*) sites="darwin ${site_arch}-darwin" ;; |
| 65 |
+ esac |
| 66 |
|
| 67 |
- [[ ${CHOST/-linux-uclibceabi/} != $CHOST ]] && sites+=" linux-uclibceabi ${site_arch}-linux-uclibceabi" |
| 68 |
- [[ ${CHOST/-linux-gnueabi/} != $CHOST ]] && sites+=" linux-gnueabi ${site_arch}-linux-gnueabi" |
| 69 |
+ case ${CHOST} in |
| 70 |
+ *-linux-uclibc) sites="linux-uclibc ${site_arch}-linux-uclibc" ;; |
| 71 |
+ *-linux-gnu) sites="linux-gnu ${site_arch}-linux-gnu" ;; |
| 72 |
+ *-linux-uclibceabi) sites="linux-uclibceabi ${site_arch}-linux-uclibceabi" ;; |
| 73 |
+ *-linux-gnueabi) sites="linux-gnueabi ${site_arch}-linux-gnueabi" ;; |
| 74 |
+ esac |
| 75 |
|
| 76 |
for x in ${sites} ${CHOST}; do |
| 77 |
- [[ -e ${TOPDIR}/${x} ]] && echo ${TOPDIR}/${x} |
| 78 |
+ [ -e "${TOPDIR}/${x}" ] && echo "${TOPDIR}/${x}" |
| 79 |
done |
| 80 |
} |
| 81 |
|
| 82 |
# Only kick in for cross-compiles so we don't break native builds #427184 |
| 83 |
-if [[ ${CBUILD:-${CHOST}} != ${CHOST} ]]; then |
| 84 |
+if [ "${CBUILD:-${CHOST}}" != "${CHOST}" ] ; then |
| 85 |
sites="$(config_site_names)" |
| 86 |
- if [[ ${sites} != "" ]]; then |
| 87 |
+ if [ -n "${sites}" ] ; then |
| 88 |
for site in ${sites}; do |
| 89 |
- echo "$(basename $0): loading site script ${site}" |
| 90 |
- . ${site} |
| 91 |
+ echo "${0##*/}: loading site script ${site}" |
| 92 |
+ . "${site}" |
| 93 |
done |
| 94 |
fi |
| 95 |
- unset site |
| 96 |
- unset sites |
| 97 |
+ unset site sites |
| 98 |
fi |
Archives