diff --git a/bootstrap.sh b/bootstrap.sh index 4bd3de5e..571a5f4b 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash set -e -EIGEN_URL='https://gitlab.com/libeigen/eigen/-/archive/3.3.7/eigen-3.3.7.tar.bz2' -EIGEN_SHA256SUM='685adf14bd8e9c015b78097c1dc22f2f01343756f196acdc76a678e1ae352e11' +EIGEN_URL='https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.tar.bz2' +EIGEN_SHA256SUM='b4c198460eba6f28d34894e3a5710998818515104d6e74e5cc331ce31e46e626' echo "-- deploying Eigen source..." -ARC=`basename ${EIGEN_URL}` +ARC=$(basename ${EIGEN_URL}) wget ${EIGEN_URL} --no-check-certificate if command -v sha256sum; then echo "$EIGEN_SHA256SUM $(basename "$EIGEN_URL")" \ @@ -14,13 +14,8 @@ if command -v sha256sum; then else echo "WARNING: could not verify checksum, please install sha256sum" >&2 fi -./scripts/update_eigen.sh ${ARC} -rm ${ARC} -# patch for non-portable includes in Eigen 3.3.5 -# apparently already fixed in Eigen HEAD so it should not be -# a problem in the future (A.P.) -patch Eigen/unsupported/Eigen/CXX11/Tensor scripts/eigen-3.3.5.Tensor.patch - +./scripts/update_eigen.sh "${ARC}" +rm "${ARC}" echo '-- generating Make.inc files...' ./scripts/filelist echo '-- generating configure script...' diff --git a/scripts/eigen-3.3.5.Tensor.patch b/scripts/eigen-3.3.5.Tensor.patch deleted file mode 100644 index 54984b94..00000000 --- a/scripts/eigen-3.3.5.Tensor.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- ./Eigen/unsupported/Eigen/CXX11/Tensor 2018-07-23 10:33:42.000000000 +0100 -+++ Tensor 2018-08-28 16:15:56.000000000 +0100 -@@ -25,7 +25,7 @@ - #include - #endif - --#include -+#include "../../../Eigen/src/Core/util/DisableStupidWarnings.h" - - #include "../SpecialFunctions" - #include "src/util/CXX11Meta.h" -@@ -147,6 +147,6 @@ - - #include "src/Tensor/TensorIO.h" - --#include -+#include "../../../Eigen/src/Core/util/ReenableStupidWarnings.h" - - //#endif // EIGEN_CXX11_TENSOR_MODULE