configure: remove git pull, improve --pb support
original commit: e6d6783dddb25339fbf613e70e361a7f4d18cd94
This commit is contained in:
Matthew Flatt
parent
c90eea4850
commit
c2e4bba728
|
|
@ -1,6 +1,6 @@
|
|||
# Mf-ta6fb
|
||||
|
||||
m = ta6fb
|
||||
m ?= ta6fb
|
||||
|
||||
threadLibs = -lpthread
|
||||
threadFlags = -D_REENTRANT -pthread
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Mf-ta6le
|
||||
|
||||
m = ta6le
|
||||
m ?= ta6le
|
||||
|
||||
threadLibs = -lpthread
|
||||
threadFlags = -D_REENTRANT -pthread
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Mf-ta6nb
|
||||
|
||||
m = ta6nb
|
||||
m ?= ta6nb
|
||||
|
||||
threadLibs = -lpthread
|
||||
threadFlags = -D_REENTRANT -pthread
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Mf-ta6nt
|
||||
|
||||
m = ta6nt
|
||||
m ?= ta6nt
|
||||
|
||||
include Mf-a6nt
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Mf-ta6ob
|
||||
|
||||
m = ta6ob
|
||||
m ?= ta6ob
|
||||
|
||||
threadLibs = -lpthread
|
||||
threadFlags = -D_REENTRANT -pthread
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Mf-ta6osx
|
||||
|
||||
m = ta6osx
|
||||
m ?= ta6osx
|
||||
|
||||
include Mf-a6osx
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Mf-ta6s2
|
||||
|
||||
m = ta6s2
|
||||
m ?= ta6s2
|
||||
|
||||
threadLibs = -lpthread
|
||||
threadFlags = -D_REENTRANT
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Mf-tarm32le
|
||||
|
||||
m = tarm32le
|
||||
m ?= tarm32le
|
||||
|
||||
threadLibs = -lpthread
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Mf-tarm64le
|
||||
|
||||
m = tarm64le
|
||||
m ?= tarm64le
|
||||
|
||||
threadLibs = -lpthread
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Mf-ti3fb
|
||||
|
||||
m = ti3fb
|
||||
m ?= ti3fb
|
||||
|
||||
threadLibs = -lpthread
|
||||
threadFlags = -D_REENTRANT -pthread
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Mf-ti3le
|
||||
|
||||
m = ti3le
|
||||
m ?= ti3le
|
||||
|
||||
threadLibs = -lpthread
|
||||
threadFlags = -D_REENTRANT -pthread
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Mf-ti3nb
|
||||
|
||||
m = ti3nb
|
||||
m ?= ti3nb
|
||||
|
||||
threadLibs = -lpthread
|
||||
threadFlags = -D_REENTRANT -pthread
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Mf-ti3nt
|
||||
|
||||
m = ti3nt
|
||||
m ?= ti3nt
|
||||
|
||||
include Mf-i3nt
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Mf-ti3ob
|
||||
|
||||
m = ti3ob
|
||||
m ?= ti3ob
|
||||
|
||||
threadLibs = -lpthread
|
||||
threadFlags = -D_REENTRANT -pthread
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Mf-ti3osx
|
||||
|
||||
m = ti3osx
|
||||
m ?= ti3osx
|
||||
|
||||
include Mf-i3osx
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Mf-ti3s2
|
||||
|
||||
m = ti3s2
|
||||
m ?= ti3s2
|
||||
|
||||
threadLibs = -lpthread
|
||||
threadFlags = -D_REENTRANT
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Mf-tppc32le
|
||||
|
||||
m = tppc32le
|
||||
m ?= tppc32le
|
||||
|
||||
threadLibs = -lpthread
|
||||
threadFlags = -D_REENTRANT -pthread
|
||||
|
|
|
|||
37
configure
vendored
37
configure
vendored
|
|
@ -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
|
||||
|
|
|
|||
10
workarea
10
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
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user