diff --git a/c/Mf-ta6fb b/c/Mf-ta6fb index b251569b37..09d333bd9e 100644 --- a/c/Mf-ta6fb +++ b/c/Mf-ta6fb @@ -1,6 +1,6 @@ # Mf-ta6fb -m = ta6fb +m ?= ta6fb threadLibs = -lpthread threadFlags = -D_REENTRANT -pthread diff --git a/c/Mf-ta6le b/c/Mf-ta6le index 44a12cb046..ccf80f2ec6 100644 --- a/c/Mf-ta6le +++ b/c/Mf-ta6le @@ -1,6 +1,6 @@ # Mf-ta6le -m = ta6le +m ?= ta6le threadLibs = -lpthread threadFlags = -D_REENTRANT -pthread diff --git a/c/Mf-ta6nb b/c/Mf-ta6nb index 75ead45e0f..27f9774e1f 100644 --- a/c/Mf-ta6nb +++ b/c/Mf-ta6nb @@ -1,6 +1,6 @@ # Mf-ta6nb -m = ta6nb +m ?= ta6nb threadLibs = -lpthread threadFlags = -D_REENTRANT -pthread diff --git a/c/Mf-ta6nt b/c/Mf-ta6nt index 9e1fb593ab..ea40fa996e 100644 --- a/c/Mf-ta6nt +++ b/c/Mf-ta6nt @@ -1,5 +1,5 @@ # Mf-ta6nt -m = ta6nt +m ?= ta6nt include Mf-a6nt diff --git a/c/Mf-ta6ob b/c/Mf-ta6ob index e973b66ff2..91e30816a4 100644 --- a/c/Mf-ta6ob +++ b/c/Mf-ta6ob @@ -1,6 +1,6 @@ # Mf-ta6ob -m = ta6ob +m ?= ta6ob threadLibs = -lpthread threadFlags = -D_REENTRANT -pthread diff --git a/c/Mf-ta6osx b/c/Mf-ta6osx index 2696b70f1e..4907914cb3 100644 --- a/c/Mf-ta6osx +++ b/c/Mf-ta6osx @@ -1,5 +1,5 @@ # Mf-ta6osx -m = ta6osx +m ?= ta6osx include Mf-a6osx diff --git a/c/Mf-ta6s2 b/c/Mf-ta6s2 index 525fe5fa32..72ba86dad2 100644 --- a/c/Mf-ta6s2 +++ b/c/Mf-ta6s2 @@ -1,6 +1,6 @@ # Mf-ta6s2 -m = ta6s2 +m ?= ta6s2 threadLibs = -lpthread threadFlags = -D_REENTRANT diff --git a/c/Mf-tarm32le b/c/Mf-tarm32le index 6a9d00b639..dec8873185 100644 --- a/c/Mf-tarm32le +++ b/c/Mf-tarm32le @@ -1,6 +1,6 @@ # Mf-tarm32le -m = tarm32le +m ?= tarm32le threadLibs = -lpthread diff --git a/c/Mf-tarm64le b/c/Mf-tarm64le index 790afe2134..ff52cd0959 100644 --- a/c/Mf-tarm64le +++ b/c/Mf-tarm64le @@ -1,6 +1,6 @@ # Mf-tarm64le -m = tarm64le +m ?= tarm64le threadLibs = -lpthread diff --git a/c/Mf-ti3fb b/c/Mf-ti3fb index b4e99bb6b5..11a90f5f44 100644 --- a/c/Mf-ti3fb +++ b/c/Mf-ti3fb @@ -1,6 +1,6 @@ # Mf-ti3fb -m = ti3fb +m ?= ti3fb threadLibs = -lpthread threadFlags = -D_REENTRANT -pthread diff --git a/c/Mf-ti3le b/c/Mf-ti3le index 44a2c9d499..5aa4ba4133 100644 --- a/c/Mf-ti3le +++ b/c/Mf-ti3le @@ -1,6 +1,6 @@ # Mf-ti3le -m = ti3le +m ?= ti3le threadLibs = -lpthread threadFlags = -D_REENTRANT -pthread diff --git a/c/Mf-ti3nb b/c/Mf-ti3nb index 29fe5184ad..b1100f95d6 100644 --- a/c/Mf-ti3nb +++ b/c/Mf-ti3nb @@ -1,6 +1,6 @@ # Mf-ti3nb -m = ti3nb +m ?= ti3nb threadLibs = -lpthread threadFlags = -D_REENTRANT -pthread diff --git a/c/Mf-ti3nt b/c/Mf-ti3nt index 4a04350802..7016fbf080 100644 --- a/c/Mf-ti3nt +++ b/c/Mf-ti3nt @@ -1,5 +1,5 @@ # Mf-ti3nt -m = ti3nt +m ?= ti3nt include Mf-i3nt diff --git a/c/Mf-ti3ob b/c/Mf-ti3ob index 494e937701..d0cbfbf71c 100644 --- a/c/Mf-ti3ob +++ b/c/Mf-ti3ob @@ -1,6 +1,6 @@ # Mf-ti3ob -m = ti3ob +m ?= ti3ob threadLibs = -lpthread threadFlags = -D_REENTRANT -pthread diff --git a/c/Mf-ti3osx b/c/Mf-ti3osx index 2f0c8d7c11..9cd7e049ac 100644 --- a/c/Mf-ti3osx +++ b/c/Mf-ti3osx @@ -1,5 +1,5 @@ # Mf-ti3osx -m = ti3osx +m ?= ti3osx include Mf-i3osx diff --git a/c/Mf-ti3s2 b/c/Mf-ti3s2 index 0cbf376db6..970c5c0070 100644 --- a/c/Mf-ti3s2 +++ b/c/Mf-ti3s2 @@ -1,6 +1,6 @@ # Mf-ti3s2 -m = ti3s2 +m ?= ti3s2 threadLibs = -lpthread threadFlags = -D_REENTRANT diff --git a/c/Mf-tppc32le b/c/Mf-tppc32le index 3182da0ac2..6da0615e86 100644 --- a/c/Mf-tppc32le +++ b/c/Mf-tppc32le @@ -1,6 +1,6 @@ # Mf-tppc32le -m = tppc32le +m ?= tppc32le threadLibs = -lpthread threadFlags = -D_REENTRANT -pthread diff --git a/configure b/configure index 75f8c8dbd8..0faf340796 100755 --- a/configure +++ b/configure @@ -342,6 +342,9 @@ if [ "$m" = "" ] ; then if [ $threads = yes ] ; then m=$tm32 ; else m=$m32 ; fi fi fi +elif [ $pb = yes ] ; then + mpbhost=$m + m=pb fi if [ "$w" = "" ] ; then @@ -472,32 +475,28 @@ if [ "$m" = "" -o ! -f boot/$m/scheme.boot ] ; then exit 1 fi -if [ -d '.git' ] && command -v git >/dev/null 2>&1 ; then - git submodule init && git submodule update || exit 1 -else - if [ ! -f 'nanopass/nanopass.ss' ] ; then - rmdir nanopass > /dev/null 2>&1 - (curl -L -o v1.9.tar.gz https://github.com/nanopass/nanopass-framework-scheme/archive/v1.9.tar.gz && tar -zxf v1.9.tar.gz && mv nanopass-framework-scheme-1.9 nanopass && rm v1.9.tar.gz) || exit 1 - fi +if [ ! -f 'nanopass/nanopass.ss' ] ; then + echo "nanopass source is missing; you may need to check out git submodules" + exit 1 +fi - if [ "${zlibDep}" != "" ] ; then +if [ "${zlibDep}" != "" ] ; then if [ ! -f 'zlib/configure' ] ; then - rmdir zlib > /dev/null 2>&1 - (curl -L -o v1.2.11.tar.gz https://github.com/madler/zlib/archive/v1.2.11.tar.gz && tar -xzf v1.2.11.tar.gz && mv zlib-1.2.11 zlib && rm v1.2.11.tar.gz) || exit 1 + echo "zlib source is missing; you may need to check out git submodules" + exit 1 fi - fi +fi - if [ "${LZ4Dep}" != "" ] ; then +if [ "${LZ4Dep}" != "" ] ; then if [ ! -f 'lz4/lib/Makefile' ] ; then - rmdir lz4 > /dev/null 2>&1 - (curl -L -o v1.8.3.tar.gz https://github.com/lz4/lz4/archive/v1.8.3.tar.gz && tar -xzf v1.8.3.tar.gz && mv lz4-1.8.3 lz4 && rm v1.8.3.tar.gz) || exit 1 + echo "lz4 source is missing; you may need to check out git submodules" + exit 1 fi - fi +fi - if [ ! -f 'stex/Mf-stex' ] ; then - rmdir stex > /dev/null 2>&1 - (curl -L -o v1.2.1.tar.gz https://github.com/dybvig/stex/archive/v1.2.1.tar.gz && tar -zxf v1.2.1.tar.gz && mv stex-1.2.1 stex && rm v1.2.1.tar.gz) || exit 1 - fi +if [ ! -f 'stex/Mf-stex' ] ; then + echo "stex source is missing; you may need to check out git submodules" + exit 1 fi ./workarea $m $w $mpbhost diff --git a/workarea b/workarea index 74d24e8077..03f65574d3 100755 --- a/workarea +++ b/workarea @@ -39,6 +39,11 @@ fi Muni="" case "$M" in + pb) Mhost=$Mpbhost ;; + *) Mhost=$M ;; +esac + +case "$Mhost" in a6fb) ;; a6le) ;; a6nb) ;; @@ -75,14 +80,13 @@ case "$M" in ti3qnx) Muni=i3qnx ;; ti3s2) Muni=i3s2 ;; tppc32le) Muni=ppc32le ;; - pb) ;; - *) echo "Unrecognized machine name $M"; exit 1 ;; + *) echo "Unrecognized machine name $Mhost"; exit 1 ;; esac if [ "$Muni" != "" ] ; then Muniarch=$Muni else - Muniarch=$M + Muniarch=$Mhost fi case "$Muniarch" in