diff --git a/ShellB3/shallbethree.sh b/ShellB3/shallbethree.sh index 2120baa3418f308aa123ad30bcf6de53eb35ba36..fbf5348b8c35ba58e0c2700fcaed13dcb6d8a0ce 100755 --- a/ShellB3/shallbethree.sh +++ b/ShellB3/shallbethree.sh @@ -740,10 +740,10 @@ export STACKLESS2FSVER=2.7 export STACKLESS3VER=364 export STACKLESS3FSVER=3.6 -export PY36VER=3.6.7 +export PY36VER=3.6.8 export PY36FSVER=3.6 -export PY3VER=3.8.0a2 +export PY3VER=3.8.0a3 export PY3FSVER=3.8 export LLVMSIMPLEVER=$(echo ${LLVMVER} | cut -c-3) @@ -1979,7 +1979,7 @@ if isDarwin ; then export SB3FFLAGS="--sysroot=${SYSROOT} ${CPUFLAGS} -B ${SYSROOT}/usr/lib/system -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" export SB3CFLAGS="-isysroot ${SYSROOT} ${CPUFLAGS} -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" export SB3CXXFLAGS="-isysroot ${SYSROOT} ${CPUFLAGS} -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET} -stdlib=libc++" - export SB3LDFLAGS="-isysroot ${SYSROOT} ${CPUFLAGS} -lc++ -lc++abi -headerpad_max_install_names -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" #--sysroot=$SYSROOT" + export SB3LDFLAGS="-isysroot ${SYSROOT} ${CPUFLAGS} -lc++ -lc++abi -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" #--sysroot=$SYSROOT" export SB3CPPFLAGS="-stdlib=libc++ -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" #--sysroot=$SYSROOT" export SYS_FORBIDDENLIBS="libstdc++" export USE_SYS_ZLIB=YES @@ -1993,9 +1993,9 @@ if isDarwin ; then export SB3FFLAGS="--sysroot=${SYSROOT} ${CPUFLAGS} -B ${SYSROOT}/usr/lib/system -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" export SB3CFLAGS="-isysroot ${SYSROOT} ${CPUFLAGS} -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" export SB3CXXFLAGS="-isysroot ${SYSROOT} ${CPUFLAGS} -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET} -stdlib=libc++" - export SB3LDFLAGS="-isysroot ${SYSROOT} ${CPUFLAGS} -lc++ -lc++abi -headerpad_max_install_names -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" #--sysroot=$SYSROOT" + export SB3LDFLAGS="-isysroot ${SYSROOT} ${CPUFLAGS} -lc++ -lc++abi -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" #--sysroot=$SYSROOT" export SB3CPPFLAGS="-stdlib=libc++ -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" #--sysroot=$SYSROOT" - export SYS_FORBIDDENLIBS="libstdc++" + export SYS_FORBIDDENLIBS="libstdc++,libblas,libcblas,liblapack,libgrib_api" export USE_SYS_ZLIB=YES export USE_SYS_SQLITE=YES USE_SYS_CURL=YES export USE_PORTABLE_LIBTOOL=YES diff --git a/ShellB3/src/Python-3.6.7.tar.xz b/ShellB3/src/Python-3.6.7.tar.xz deleted file mode 100644 index 30f28ed2379ceb625a64a06c4938d8302b8592cf..0000000000000000000000000000000000000000 --- a/ShellB3/src/Python-3.6.7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:81fd1401a9d66533b0a3e9e3f4ea1c7c6702d57d5b90d659f971e6f1b745f77d -size 17178476 diff --git a/ShellB3/src/Python-3.6.8.tar.xz b/ShellB3/src/Python-3.6.8.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..298b9087400db079e680418c81424606d97e10ea --- /dev/null +++ b/ShellB3/src/Python-3.6.8.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35446241e995773b1bed7d196f4b624dadcadc8429f26282e756b2fb8a351193 +size 17212420 diff --git a/ShellB3/src/Python-3.8.0a2.tar.xz b/ShellB3/src/Python-3.8.0a2.tar.xz deleted file mode 100644 index 3ae7f11b2df48d9a73b5d2235ca7bfb1f1c72cb6..0000000000000000000000000000000000000000 --- a/ShellB3/src/Python-3.8.0a2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64f08ef60c86474d1390917841c1b618391e6ba01a42cf33977414bd602e8b5d -size 17201560 diff --git a/ShellB3/src/Python-3.8.0a3.tar.xz b/ShellB3/src/Python-3.8.0a3.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..1602c36e9158697c288c229d228b48c29f6c9adb --- /dev/null +++ b/ShellB3/src/Python-3.8.0a3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c5bcc2596e1dd14ab8c5292f6c2421cbb5e295d7e7a8039e22c604248c351f5 +size 17267880