Index: build/fake-bin/uname ================================================================== --- build/fake-bin/uname +++ build/fake-bin/uname @@ -3,10 +3,18 @@ if [ "$1" == "--fake" ]; then echo "true" exit 0 fi + +# Some systems do not compile well with this fake uname in place +# provide the real uname for them. +case "${CROSS}" in + mipsel-unknown-linux-uclibc) + unset CROSS + ;; +esac if [ -z "${CROSS}" ]; then # If not cross compiling, revert to system uname while [ "$(uname --fake 2>/dev/null)" == "true" -a -n "${PATH}" ]; do PATH="$(echo "${PATH}" | /usr/bin/sed 's@^[^:]*$@@;s@^[^:]*:@@')" @@ -65,12 +73,15 @@ sysmachine="i686" ;; ia64-*) sysmachine="ia64" ;; - arm-*) + arm-*|armel-*|armeb-*) sysmachine="armv7l" + ;; + mipsel-*|mipseb-*) + sysmachine="mips" ;; esac for arg in $(echo "$@" | sed 's@.@ & @g'); do case "${arg}" in Index: build/make-kit-crosscompile ================================================================== --- build/make-kit-crosscompile +++ build/make-kit-crosscompile @@ -7,11 +7,11 @@ fi CCROOT="${HOME}/root/cross-compilers/${CROSS}" CCROOTBIN="${CCROOT}/bin" -PATH="$(pwd)/build/fake-bin:${CCROOT}/${CROSS}/bin:${PATH}:${CCROOTBIN}" +PATH="$(pwd)/build/fake-bin:${PATH}:${CCROOTBIN}" AR="${CCROOTBIN}/${CROSS}-ar" CC="${CCROOTBIN}/${CROSS}-gcc ${CC_ADD}" CXX="${CCROOTBIN}/${CROSS}-g++ ${CC_ADD}" RANLIB="${CCROOTBIN}/${CROSS}-ranlib" if [ -z "${STRIP}" ]; then Index: build/make-kit-linux-mipsel ================================================================== --- build/make-kit-linux-mipsel +++ build/make-kit-linux-mipsel @@ -1,11 +1,6 @@ #! /bin/sh -PATH="${PATH}:/home/rkeene/root/cross-compilers/mipsel-unknown-linux-uclibc/bin" -AR=mipsel-unknown-linux-uclibc-ar -CC=mipsel-unknown-linux-uclibc-gcc -CXX=mipsel-unknown-linux-uclibc-g++ -RANLIB=mipsel-unknown-linux-uclibc-ranlib -STRIP="${STRIP:-mipsel-unknown-linux-uclibc-strip}" -export PATH AR CC CXX RANLIB STRIP - -./build/make-minkit "$@" --host=mipsel-unknown-linux-uclibc +CROSS="mipsel-unknown-linux-uclibc" +export CROSS + +./build/make-kit-crosscompile "$@" Index: build/test/test ================================================================== --- build/test/test +++ build/test/test @@ -67,11 +67,11 @@ export DISPLAY if [ "${BIGBUILD}" = "1" ]; then 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)" else - 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" + 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-notk linux-mipsel-notk-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" fi failed="" for kit in $kits; do kitcreator="./kitcreator" @@ -115,10 +115,11 @@ xcompile="1" notk="1" iszip="1" ;; android-arm|android-arm-*|\ + linux-mipsel|linux-mipsel-*|\ linux-i386|linux-i386-*|\ linux-amd64|linux-amd64-*|\ solaris-i386|solaris-i386-*|\ solaris-amd64|solaris-amd64-*|\ solaris-sparc|solaris-sparc-*|\