fixed build for systems with libisl > 0.20

 * bump gcc to 8.4.0
 * should fix build errors on Debian/ArchLinux

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>

2 files changed, 15 insertions, 8 deletions

diff --git a/deps/makedeps.sh b/deps/makedeps.sh
index 8d16ced..2c3387b 100755
--- a/deps/makedeps.sh
+++ b/deps/makedeps.sh
@@ -59,10 +59,11 @@ BOLD=$(tput bold)
 NC=$(tput sgr0)
 cd "$(dirname $0)"
 
-export PYTHON=Python-2.7.18
+export MILLER_PYTHON=Python-2.7.18
 export MINGW=mingw-w64-v6.0.0
+export ISL=isl-0.20
 export BIN=binutils-2.31.1
-export GCC=gcc-8.2.0
+export GCC=gcc-8.4.0
 export GMP=gmp-6.1.2
 export MPF=mpfr-4.0.1
 export MPC=mpc-1.1.0
@@ -173,7 +174,7 @@ if [ ! -d "${MY_SYS_ROOT}" ]; then
 	rm -rf ${BUILDDIRS} ${PY_BUILD_STAMP}
 fi
 
-dl_and_extract_gz "${PYTHON}" "https://www.python.org/ftp/python/2.7.18/${PYTHON}.tgz"
+dl_and_extract_gz "${MILLER_PYTHON}" "https://www.python.org/ftp/python/2.7.18/${MILLER_PYTHON}.tgz"
 
 #libtor is disabled until patch the was ported
 #dl_and_extract "${TOR}" "https://www.torproject.org/dist/${TOR}.tar.gz"
@@ -184,6 +185,7 @@ dl_and_extract_gz "${PYTHON}" "https://www.python.org/ftp/python/2.7.18/${PYTHON
 #fi
 
 dl_and_extract_bz "${MINGW}" "https://vorboss.dl.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/${MINGW}.tar.bz2"
+dl_and_extract_gz "${ISL}" "http://isl.gforge.inria.fr/${ISL}.tar.gz"
 dl_and_extract_gz "${BIN}" "https://ftp.gnu.org/gnu/binutils/${BIN}.tar.gz"
 dl_and_extract_gz "${GCC}" "https://ftp.gnu.org/gnu/gcc/${GCC}/${GCC}.tar.gz"
 dl_and_extract_gz "${MUSL}" "https://www.musl-libc.org/releases/${MUSL}.tar.gz"
@@ -193,6 +195,10 @@ dl_and_extract_gz "${OPENSSL}" "https://www.openssl.org/source/${OPENSSL}.tar.gz
 dl_and_extract_gz "${ZLIB}" "https://zlib.net/${ZLIB}.tar.gz"
 dl_and_extract_gz "${LIBEVENT}" "https://github.com/libevent/libevent/releases/download/release-2.1.8-stable/${LIBEVENT}.tar.gz"
 
+if [ ! -d "${GCC}/isl" ]; then
+    dbg_run mv -fv "${ISL}" "${GCC}/isl"
+fi
+
 test -f "${GMP}.tar.bz2" || { dbg_run wget "https://gmplib.org/download/gmp/${GMP}.tar.bz2" -O".tmp.${GMP}.tar.bz2" && dbg_run mv ".tmp.${GMP}.tar.bz2" "${GMP}.tar.bz2" || false; }
 test -f "${MPF}.tar.bz2" || { dbg_run wget "http://www.mpfr.org/mpfr-4.0.1/${MPF}.tar.bz2" -O".tmp.${MPF}.tar.bz2" && dbg_run mv ".tmp.${MPF}.tar.bz2" "${MPF}.tar.bz2" || false; }
 test -f "${MPC}.tar.gz" || { dbg_run wget "ftp://ftp.gnu.org/gnu/mpc/${MPC}.tar.gz" -O".tmp.${MPC}.tar.gz" && dbg_run mv ".tmp.${MPC}.tar.gz" "${MPC}.tar.gz" || false; }
@@ -200,12 +206,12 @@ test -f "${MPC}.tar.gz" || { dbg_run wget "ftp://ftp.gnu.org/gnu/mpc/${MPC}.tar.
 if [ ! -d "${GCC}/gmp" ]; then
     dbg "extract gmp"
     dbg_run tar -xjf "${GMP}.tar.bz2"
-    dbg_run mv "${GMP}" "${GCC}/gmp"
+    dbg_run mv -fv "${GMP}" "${GCC}/gmp"
 fi
 if [ ! -d "${GCC}/mpfr" ]; then
     dbg "extract mpfr"
     dbg_run tar -xjf "${MPF}.tar.bz2"
-    dbg_run mv "${MPF}" "${GCC}/mpfr"
+    dbg_run mv -fv "${MPF}" "${GCC}/mpfr"
 fi
 if [ ! -d "${GCC}/mpc" ]; then
     dbg "extract mpc"
@@ -272,10 +278,10 @@ DBG_NOERR=1 dbg_run ln -sr "${MY_SYS_ROOT}/bin/strip" "${MY_SYS_ROOT}/lib/gcc/$(
 if [ ! -r ${PY_BUILD_STAMP} ]; then
     dbg "MAKE PYTHON"
     cd build_python
-    test -f Makefile || dbg_run ../${PYTHON}/configure --prefix=${MY_SYS_ROOT} --enable-optimizations --disable-shared
+    test -f Makefile || dbg_run ../${MILLER_PYTHON}/configure --prefix=${MY_SYS_ROOT} --enable-optimizations --disable-shared
     dbg_run make -j${NMB_BUILDJOBS}
     dbg_run make install
-    dbg_run ln -sr ${MY_SYS_ROOT}/bin/python2.7 ${MY_SYS_ROOT}/bin/${PYTHON} || true
+    dbg_run ln -sr ${MY_SYS_ROOT}/bin/python2.7 ${MY_SYS_ROOT}/bin/${MILLER_PYTHON} || true
     dbg_run ${STRIP} -s "${MY_SYS_ROOT}/bin/python2.7"
     cd ..
     dbg_run touch ${PY_BUILD_STAMP} # build python only once (takes lots of time with --enable-optimizations + tests)
diff --git a/deps/sha512.chksms b/deps/sha512.chksms
index cc606cb..fd1bb2a 100644
--- a/deps/sha512.chksms
+++ b/deps/sha512.chksms
@@ -4,9 +4,10 @@ c1674fc0a5edcde188bdf7d6d14063cfb4f1259b9eaf39d0081f7176e9921ca0af1b12b7aba1a956
 268db88447174617f5746d9a6ba2b105940cc1a5e73155eb23b6eedf55f8e7724eda05d161b2de19aca9e794956d226ba9ed6f23124c7c82f7e1872e32b003cf  gmp-6.1.2.tar.bz2
 e3d3663e0cb33a16f90b1a33e81b5a30d26f7e34270b14e865c10068f2a2d32da9ef8cbbb0c3fed9c71429ae11c82152ff3b87d81558929b2a4993dc99cfc11e  mingw-w64-v6.0.0.tar.bz2
 6e8867cacf58a6f79122ccee00afbb894c1709375580afc14b523dc7d123029bf2532f9f71e4c6c7072b2d708cc97a370c922d80fa17b3ee3ddeb49110cd749b  binutils-2.31.1.tar.gz
-3182cd248a37ce4c36ad2a43f1910da13325452472ea80855afc21f134c4e4792c29887f5e070fe21c3ff8e5953e59f69343e1d3b968ee1eb2d8b5c8ae9f48fa  gcc-8.2.0.tar.gz
+a0340bb83fb0ac0d3f7e0bcd06f6d5aa21e464ef319ab057cfacff036aa1f0d53e73a8b0ec2a00fd5eb1ea897401ffb510f7ac315bb5f5c88a6ae60497d921c0  gcc-8.4.0.tar.gz
 03f1c97380cec892f2c465f7e3e3c99a55b5a7b7b966f71fba9398940ed332b7d960770ce75fafe549feaa70636edbf94b48b848137c9df3b0c8adb1dcbb1394  nasm-2.12.02.tar.gz
 4861ec6428fead416f5cbbbb0bbad10b9152967e481d4b0ff2eb396a9f297f552984c9bb72f6864a37dcd8fca1d9ccceda3ef18d8f121938dbe4fdf2b870fe75  pkg-config-0.29.2.tar.gz
 b00bd9b5ad5298fbceeec6bb19c1ab0c106ca5cfb31178497c58bf7e0e0cf30fcc19c20f84e23af31cc126bf2447d3e4f8461db97bafa7bd78f69561932f000c  openssl-1.1.1f.tar.gz
 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae  zlib-1.2.11.tar.gz
 a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17  libevent-2.1.8-stable.tar.gz
+24d3cb349d07a7f2f75c78593416470293d8027eee91ef8547a667222ed9ad91fc3d16a127a1988eefff3878accdf070c1b3aaff4e185dcb79503d8146f15b05  isl-0.20.tar.gz