Overview
Comment: | Updated to normalize CPU names
Added linux-i386 build target |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: | 33550a1dffab9863cef3cb5b67f78531528e3776 |
User & Date: | rkeene on 2012-05-10 17:54:10 |
Other Links: | manifest | tags |
Context
2012-05-13
| ||
01:56 | Renamed Linux/mipsel build script for consistency check-in: a1316c25a9 user: rkeene tags: trunk | |
2012-05-10
| ||
17:54 |
Updated to normalize CPU names
Added linux-i386 build target check-in: 33550a1dff user: rkeene tags: trunk | |
2012-05-07
| ||
04:18 | Stopped use of -mno-cygwin as it has been removed from some Mingw32s check-in: 9396658a02 user: rkeene tags: trunk | |
Changes
Added build/make-kit-linux-i386 version [c72ea56080].
1 +#! /bin/sh 2 + 3 +CROSS="i486-slackware-linux" 4 +export CROSS 5 + 6 +./build/make-kit-crosscompile "$@"
Modified build/test/test from [ad0883e4eb] to [4e871ce746].
63 63 Xvfb :31 -screen 0 800x600x24 -nolisten tcp >/dev/null 2>/dev/null & 64 64 echo "$!" 65 65 )" 66 66 DISPLAY=:31 67 67 export DISPLAY 68 68 69 69 if [ "${BIGBUILD}" = "1" ]; then 70 - kits="$(echo normal{,-zip,-nomk4}{,-threaded}{,-statictk,-notk} normal{,-threaded}{,-notk}{,-nomk4}{,-debug}-kitdll win32-i586{,-zip,-nomk4}{,-threaded}{,-notk} win32-i586{,-threaded}{,-notk}{,-nomk4}-kitdll min{,-static} {linux-mipsel-min}{,-debug}{,-kitdll} {linux-amd64,solaris-i386,solaris-amd64,solaris-sparc,solaris-sparc64,freebsd-amd64,netbsd-amd64}{,-zip,-nomk4}{,-threaded}{,-statictk,-notk}{,debug} {solaris-i386,solaris-amd64,solaris-sparc,solaris-sparc64,freebsd-amd64,netbsd-amd64}{,-threaded}{,-notk}{,-nomk4}{,debug}-kitdll netbsd-i386{,-zip,-nomk4}{,-threaded}{,debug}-notk netbsd-i386{,-threaded}{,-nomk4}{,debug}-notk-kitdll android-arm-notk{,-debug} andoid-arm-notk{,-debug}-kitdll)" 70 + kits="$(echo normal{,-zip,-nomk4}{,-threaded}{,-statictk,-notk} normal{,-threaded}{,-notk}{,-nomk4}{,-debug}-kitdll win32-i586{,-zip,-nomk4}{,-threaded}{,-notk} win32-i586{,-threaded}{,-notk}{,-nomk4}-kitdll min{,-static} {linux-mipsel-min}{,-debug}{,-kitdll} {linux-i386,solaris-i386,solaris-amd64,solaris-sparc,solaris-sparc64,freebsd-amd64,netbsd-amd64}{,-zip,-nomk4}{,-threaded}{,-statictk,-notk}{,debug} {solaris-i386,solaris-amd64,solaris-sparc,solaris-sparc64,freebsd-amd64,netbsd-amd64}{,-threaded}{,-notk}{,-nomk4}{,debug}-kitdll netbsd-i386{,-zip,-nomk4}{,-threaded}{,debug}-notk netbsd-i386{,-threaded}{,-nomk4}{,debug}-notk-kitdll android-arm-notk{,-debug} andoid-arm-notk{,-debug}-kitdll)" 71 71 else 72 - kits="normal normal-zip normal-threaded normal-threaded-zip normal-statictk normal-notk normal-threaded-notk normal-threaded-zip-notk normal-nomk4 normal-debug min min-static normal-kitdll normal-threaded-kitdll normal-notk-kitdll normal-nomk4-kitdll normal-nomk4-notk-kitdll normal-threaded-nomk4-kitdll normal-threaded-notk-nomk4-kitdll normal-debug-kitdll min-kitdll win32-i586 win32-i586-zip win32-i586-threaded win32-i586-threaded-zip win32-i586-notk win32-i586-threaded-notk win32-i586-nomk4 win32-i586-kitdll win32-i586-threaded-kitdll win32-i586-notk-kitdll win32-i586-nomk4-kitdll win32-i586-nomk4-notk-kitdll win32-i586-threaded-nomk4-kitdll win32-i586-threaded-notk-nomk4-kitdll linux-mipsel-min linux-mipsel-min-kitdll linux-amd64 linux-amd64-debug linux-amd64-kitdll linux-amd64-debug-kitdll linux-amd64-notk linux-amd64-notk-debug linux-amd64-notk-kitdll linux-amd64-notk-debug-kitdll solaris-i386 solaris-i386-debug solaris-i386-kitdll solaris-i386-debug-kitdll solaris-amd64 solaris-amd64-debug solaris-amd64-kitdll solaris-amd64-debug-kitdll solaris-sparc solaris-sparc-debug solaris-sparc-kitdll solaris-sparc-debug-kitdll solaris-sparc64 solaris-sparc64-debug solaris-sparc64-kitdll solaris-sparc64-debug-kitdll freebsd-amd64 freebsd-amd64-debug freebsd-amd64-kitdll freebsd-amd64-debug-kitdll netbsd-i386-notk netbsd-i386-notk-debug netbsd-i386-notk-kitdll netbsd-i386-notk-debug-kitdll netbsd-amd64 netbsd-amd64-debug netbsd-amd64-kitdll netbsd-amd64-debug-kitdll android-arm-notk android-arm-notk-debug android-arm-notk-kitdll android-arm-notk-debug-kitdll" 72 + kits="normal normal-zip normal-threaded normal-threaded-zip normal-statictk normal-notk normal-threaded-notk normal-threaded-zip-notk normal-nomk4 normal-debug min min-static normal-kitdll normal-threaded-kitdll normal-notk-kitdll normal-nomk4-kitdll normal-nomk4-notk-kitdll normal-threaded-nomk4-kitdll normal-threaded-notk-nomk4-kitdll normal-debug-kitdll min-kitdll win32-i586 win32-i586-zip win32-i586-threaded win32-i586-threaded-zip win32-i586-notk win32-i586-threaded-notk win32-i586-nomk4 win32-i586-kitdll win32-i586-threaded-kitdll win32-i586-notk-kitdll win32-i586-nomk4-kitdll win32-i586-nomk4-notk-kitdll win32-i586-threaded-nomk4-kitdll win32-i586-threaded-notk-nomk4-kitdll linux-mipsel-min linux-mipsel-min-kitdll linux-i386 linux-i386-debug linux-i386-kitdll linux-i386-debug-kitdll linux-i386-notk linux-i386-notk-debug linux-i386-notk-kitdll linux-i386-notk-debug-kitdll solaris-i386 solaris-i386-debug solaris-i386-kitdll solaris-i386-debug-kitdll solaris-amd64 solaris-amd64-debug solaris-amd64-kitdll solaris-amd64-debug-kitdll solaris-sparc solaris-sparc-debug solaris-sparc-kitdll solaris-sparc-debug-kitdll solaris-sparc64 solaris-sparc64-debug solaris-sparc64-kitdll solaris-sparc64-debug-kitdll freebsd-amd64 freebsd-amd64-debug freebsd-amd64-kitdll freebsd-amd64-debug-kitdll netbsd-i386-notk netbsd-i386-notk-debug netbsd-i386-notk-kitdll netbsd-i386-notk-debug-kitdll netbsd-amd64 netbsd-amd64-debug netbsd-amd64-kitdll netbsd-amd64-debug-kitdll android-arm-notk android-arm-notk-debug android-arm-notk-kitdll android-arm-notk-debug-kitdll" 73 73 fi 74 74 75 75 failed="" 76 76 for kit in $kits; do 77 77 kitcreator="./kitcreator" 78 78 args="" 79 79 runnable="1" ................................................................................ 83 83 nomk4="0" 84 84 xcompile="0" 85 85 kitdll="0" 86 86 kitruncmd="" 87 87 88 88 # Handle base configuration 89 89 os="$(uname -s | dd conv=lcase 2>/dev/null)" 90 - cpu="$(uname -m | dd conv=lcase 2>/dev/null)" 90 + cpu="$(uname -m | dd conv=lcase 2>/dev/null | sed 's@x86_64@amd64@;s@i.86@i386@')" 91 91 case "${kit}" in 92 92 normal|normal-*) 93 93 kit="$(echo "${kit}" | sed "s@^normal@$os-$cpu@")" 94 94 ;; 95 95 min|min-kitdll) 96 96 kitcreator="./build/make-minkit" 97 97 iszip="1" ................................................................................ 113 113 kitcreator="./build/make-kit-mipsel" 114 114 runnable="0" 115 115 xcompile="1" 116 116 notk="1" 117 117 iszip="1" 118 118 ;; 119 119 android-arm|android-arm-*|\ 120 + linux-i386|linux-i386-*|\ 120 121 linux-amd64|linux-amd64-*|\ 121 122 solaris-i386|solaris-i386-*|\ 122 123 solaris-amd64|solaris-amd64-*|\ 123 124 solaris-sparc|solaris-sparc-*|\ 124 125 solaris-sparc64|solaris-sparc64-*|\ 125 126 freebsd-amd64|freebsd-amd64-*|\ 126 127 netbsd-i386|netbsd-i386-*|\