diff --git a/ShellB3/shallbethree.sh b/ShellB3/shallbethree.sh index ec4b9e62323352e2db32973143849cd5bb4a4a88..93ecba69b3aabf3d53834acb8266eb60a53f731f 100755 --- a/ShellB3/shallbethree.sh +++ b/ShellB3/shallbethree.sh @@ -478,7 +478,7 @@ export GCC4VER=4.8.5 export GCC5VER=5.2.0 export ZLIBVER=1.2.8 # this may come in from system or $COTS_HOME -export SQLITEVER=3081101 +export SQLITEVER=3090200 export LIBXMLVER=2.9.2 export PYVER=2.7.10 export STACKLESSVER=279 @@ -540,13 +540,13 @@ export DISTRIBUTEVER=0.6.28 export SETUPTOOLSVER=18.5 export ATLASVER=3.10.1 export EUGENEVER=4.9.2 -export HARFBUZZVER=1.0.4 +export HARFBUZZVER=1.0.6 export GLIBVER=2.44.1 export ICUVER=55_1 -export FREETYPEVER=2.6 +export FREETYPEVER=2.6.1 export JPEGVER=8d export PNGVER=1.5.21 -export TIFFVER=4.0.5 +export TIFFVER=4.0.6 export PIXMANVER=0.32.8 export CAIROVER=1.12.18 export PY2CAIROVER=1.10.0 @@ -575,7 +575,7 @@ export CONFIGOBJVER=5.0.6 export ZEROMQVER=4.1.3 export PYZMQVER=15.0.0 export GDALVER=2.0.1 -export SODIUMVER=1.0.3 +export SODIUMVER=1.0.6 export ASTROPYVER=1.0.6 export BLISTVER=1.3.6 @@ -586,7 +586,7 @@ export LLVMVER=3.6.2 export LLVMLITEVER=0.8.0 export NUMBAVER=0.22.1 export ENUM34VER=1.0.4 -export POCLVER=0.11 +export POCLVER=0.12 export REQUESTSVER=2.8.1 export PIPVER=7.1.2 export DATEUTILVER=2.4.2 @@ -609,7 +609,7 @@ export MODULEGRAPHVER=0.12.1 export ALTGRAPHVER=0.12 export MACHOLIBVER=1.7 -export OPENMPIVER=1.8.4 +export OPENMPIVER=1.10.1 export MPI4PYVER=2.0.0 export PKGCONFIGVER=0.28 @@ -626,7 +626,7 @@ export PYOPENCLVER=2015.1 export PYCUDAVER=2014.1 export BOOSTVER=1_59_0 -export HWLOCVER=1.10.1 +export HWLOCVER=1.11.1 export M4VER=1.4.17 export AUTOCONFVER=2.69 @@ -637,21 +637,21 @@ export PYLINTVER=1.4.4 #IDL bits export LIBREADLINEVER=6.3 -export GSLVER=1.16 +export GSLVER=2.1 export LIBPROJECTVER=1.01 export LIBPROJ4VER=4.9.1 export OCTAVEVER=20151007-c2633e767b10322d965ed248a4cfefbd8fc8e6b7 #20150804-0cba44413bf62f78cb058ed881dc6aef983dcd75 #4.0.0 export WXWIDGETSVER=3.0.2 -export UDUNITSVER=2.2.19 +export UDUNITSVER=2.2.20 export PCREVER=8.37 export FFTWVER=3.3.4 export GPERFVER=3.0.4 export ICOUTILSVER=0.31.0 export PLPLOTVER=5.11.1 #5.11.0 -export EIGENVER=eigen-c58038c56923 +export EIGENVER=eigen-b30b87236a1b #ver 3.2.7 export MAGICKVER=6.9.2-3 export GDLVER=0.9.5 export CMAKEVER=3.3.1 @@ -2880,7 +2880,7 @@ mk_hwloc() { [ "$USE_SYS_HWLOC" == "YES" ] && return 0 ADDITIONALFLAGS="" isDarwin && ADDITIONALFLAGS="--without-x" - _configure_make_install hwloc src/experimental/hwloc-${HWLOCVER}.tar.gz hwloc-${HWLOCVER} ${ADDITIONALFLAGS} + _configure_make_install hwloc src/experimental/hwloc-${HWLOCVER}.tar.* hwloc-${HWLOCVER} ${ADDITIONALFLAGS} } mk_m4() { @@ -3369,7 +3369,7 @@ mk_openmpi() { [ "${BUILD_OPENMPI}" == "NO" ] && return 0 ADDITIONALFLAGS="" isDarwin && ADDITIONALFLAGS="${ADDITIONALFLAGS} --without-x --enable-osx-builtin-atomics" - _configure_make_install openmpi src/experimental/openmpi-${OPENMPIVER}.tar.gz openmpi-${OPENMPIVER} \ + _configure_make_install openmpi src/experimental/openmpi-${OPENMPIVER}.tar.* openmpi-${OPENMPIVER} \ --enable-mpi-fortran=no ${ADDITIONALFLAGS} } diff --git a/ShellB3/src/experimental/hwloc-1.10.1.tar.gz b/ShellB3/src/experimental/hwloc-1.10.1.tar.gz deleted file mode 100644 index d90e26bc8dbe2247347d48bf71cc953c42eb3960..0000000000000000000000000000000000000000 Binary files a/ShellB3/src/experimental/hwloc-1.10.1.tar.gz and /dev/null differ diff --git a/ShellB3/src/experimental/hwloc-1.11.1.tar.bz2 b/ShellB3/src/experimental/hwloc-1.11.1.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..fe807b10ed9d1d8e67260e052a7f0bf8aaf9b6a4 Binary files /dev/null and b/ShellB3/src/experimental/hwloc-1.11.1.tar.bz2 differ diff --git a/ShellB3/src/experimental/openmpi-1.8.4.tar.gz b/ShellB3/src/experimental/openmpi-1.10.1.tar.bz2 similarity index 50% rename from ShellB3/src/experimental/openmpi-1.8.4.tar.gz rename to ShellB3/src/experimental/openmpi-1.10.1.tar.bz2 index a7dbdfc26e317ea1a364519c5b781fda3ac92afb..16f3ae66bf52dd13b69804d1134fdbf1f8a987d8 100644 Binary files a/ShellB3/src/experimental/openmpi-1.8.4.tar.gz and b/ShellB3/src/experimental/openmpi-1.10.1.tar.bz2 differ diff --git a/ShellB3/src/experimental/pocl-0.11.tar.gz b/ShellB3/src/experimental/pocl-0.11.tar.gz deleted file mode 100644 index f0a67b9af3485a523eeb40b247ffa1d11fb382c8..0000000000000000000000000000000000000000 Binary files a/ShellB3/src/experimental/pocl-0.11.tar.gz and /dev/null differ diff --git a/ShellB3/src/experimental/pocl-0.12.tar.gz b/ShellB3/src/experimental/pocl-0.12.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..7a31644e8e642049e0a11f9ab2ed22d9a1a6f693 Binary files /dev/null and b/ShellB3/src/experimental/pocl-0.12.tar.gz differ diff --git a/ShellB3/src/optional/IDL/eigen-eigen-b30b87236a1b.tar.bz2 b/ShellB3/src/optional/IDL/eigen-eigen-b30b87236a1b.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..5f4b46817bbf90e9a483c8f82531616dbb373e0e Binary files /dev/null and b/ShellB3/src/optional/IDL/eigen-eigen-b30b87236a1b.tar.bz2 differ diff --git a/ShellB3/src/optional/IDL/eigen-eigen-c58038c56923.tar.bz2 b/ShellB3/src/optional/IDL/eigen-eigen-c58038c56923.tar.bz2 deleted file mode 100644 index aebbff9e97e36aeeb9f111df012b856571a741b0..0000000000000000000000000000000000000000 Binary files a/ShellB3/src/optional/IDL/eigen-eigen-c58038c56923.tar.bz2 and /dev/null differ diff --git a/ShellB3/src/optional/IDL/gsl-1.16.tar.gz b/ShellB3/src/optional/IDL/gsl-1.16.tar.gz deleted file mode 100644 index ad68e06e8c6dd206334cb4c48617ffa5cca5bfc0..0000000000000000000000000000000000000000 Binary files a/ShellB3/src/optional/IDL/gsl-1.16.tar.gz and /dev/null differ diff --git a/ShellB3/src/optional/IDL/gsl-2.1.tar.gz b/ShellB3/src/optional/IDL/gsl-2.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..7bde34f867d3ac98236b9affa312df29e18dfaf4 Binary files /dev/null and b/ShellB3/src/optional/IDL/gsl-2.1.tar.gz differ diff --git a/ShellB3/src/optional/IDL/udunits-2.2.19.tar.gz b/ShellB3/src/optional/IDL/udunits-2.2.19.tar.gz deleted file mode 100644 index 8fb46fd10c1e000aea23bed0265c102cbccf8aab..0000000000000000000000000000000000000000 Binary files a/ShellB3/src/optional/IDL/udunits-2.2.19.tar.gz and /dev/null differ diff --git a/ShellB3/src/optional/IDL/udunits-2.2.20.tar.gz b/ShellB3/src/optional/IDL/udunits-2.2.20.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..e0d0ebb89c3dbeef17fba1fa2466c99dc78ecf4d Binary files /dev/null and b/ShellB3/src/optional/IDL/udunits-2.2.20.tar.gz differ diff --git a/ShellB3/src/optional/freetype-2.6.1.tar.bz2 b/ShellB3/src/optional/freetype-2.6.1.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..ea07882ed339d32b57db505b0728c04f1d688c67 Binary files /dev/null and b/ShellB3/src/optional/freetype-2.6.1.tar.bz2 differ diff --git a/ShellB3/src/optional/freetype-2.6.tar.bz2 b/ShellB3/src/optional/freetype-2.6.tar.bz2 deleted file mode 100644 index 3cdf364b5db1c1adba670b188d76035ecba2d77c..0000000000000000000000000000000000000000 Binary files a/ShellB3/src/optional/freetype-2.6.tar.bz2 and /dev/null differ diff --git a/ShellB3/src/optional/harfbuzz-1.0.4.tar.bz2 b/ShellB3/src/optional/harfbuzz-1.0.4.tar.bz2 deleted file mode 100644 index 42df3d61d16aa0e11534ee6e65ec15dd0f8190df..0000000000000000000000000000000000000000 Binary files a/ShellB3/src/optional/harfbuzz-1.0.4.tar.bz2 and /dev/null differ diff --git a/ShellB3/src/optional/harfbuzz-1.0.6.tar.bz2 b/ShellB3/src/optional/harfbuzz-1.0.6.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..5baecec575b67b391315f687cc85a3b78406dc2a Binary files /dev/null and b/ShellB3/src/optional/harfbuzz-1.0.6.tar.bz2 differ diff --git a/ShellB3/src/optional/libsodium-1.0.3.tar.gz b/ShellB3/src/optional/libsodium-1.0.3.tar.gz deleted file mode 100644 index 92830af4ebd12a8ab7b8b6f9110451bc7c7703a9..0000000000000000000000000000000000000000 Binary files a/ShellB3/src/optional/libsodium-1.0.3.tar.gz and /dev/null differ diff --git a/ShellB3/src/optional/libsodium-1.0.6.tar.gz b/ShellB3/src/optional/libsodium-1.0.6.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..9605fb0c64e5507cdefa356160e4c63d342e3ad7 Binary files /dev/null and b/ShellB3/src/optional/libsodium-1.0.6.tar.gz differ diff --git a/ShellB3/src/sqlite-autoconf-3081101.tar.gz b/ShellB3/src/sqlite-autoconf-3081101.tar.gz deleted file mode 100644 index bba2b3e499a58a061a8d3f97f6f799380b1b6418..0000000000000000000000000000000000000000 Binary files a/ShellB3/src/sqlite-autoconf-3081101.tar.gz and /dev/null differ diff --git a/ShellB3/src/sqlite-autoconf-3090200.tar.gz b/ShellB3/src/sqlite-autoconf-3090200.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..f936b38054a9b0728cb0f4aeb73a87a0cb2717fc Binary files /dev/null and b/ShellB3/src/sqlite-autoconf-3090200.tar.gz differ diff --git a/ShellB3/src/tiff-4.0.5.tar.gz b/ShellB3/src/tiff-4.0.5.tar.gz deleted file mode 100644 index dcb88b46da793e501a657a17498b2aaf376ec773..0000000000000000000000000000000000000000 Binary files a/ShellB3/src/tiff-4.0.5.tar.gz and /dev/null differ diff --git a/ShellB3/src/tiff-4.0.6.tar.gz b/ShellB3/src/tiff-4.0.6.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..a6c275bb0a444f9b43f5cd3f15e0400599dc5ffc Binary files /dev/null and b/ShellB3/src/tiff-4.0.6.tar.gz differ