diff --git a/build/bin/sage-system-python b/build/bin/sage-system-python index 7ba5ed30257..75167d58ec4 100755 --- a/build/bin/sage-system-python +++ b/build/bin/sage-system-python @@ -20,7 +20,7 @@ fi # # See https://trac.sagemath.org/ticket/29090 -PYTHONS="python3 python3.8 python3.7 python2.7 python python3.6 python2" +PYTHONS="python2 python3 python3.8 python3.7 python2.7 python python3.6 python2" for PY in $PYTHONS; do PYTHON="$(PATH="$SAGE_ORIG_PATH" command -v $PY)" if [[ -n "$PYTHON" ]]; then diff --git a/build/pkgs/arb/checksums.ini b/build/pkgs/arb/checksums.ini index 3e0307d9140..6de00342908 100644 --- a/build/pkgs/arb/checksums.ini +++ b/build/pkgs/arb/checksums.ini @@ -1,4 +1,5 @@ tarball=arb-VERSION.tar.gz -sha1=cdbb3d63034a39f22f850def9bd365f7073f620a -md5=17816f8aa027a5e7fb8b5e62b2b40ce4 -cksum=577630044 +sha1=2413945982b8da63f51750d1f18ac801af4ed42f +md5=0fa2bf5c384183fb6c8a6ad353200d34 +cksum=2778782461 +upstream_url=https://github.com/fredrik-johansson/arb/archive/VERSION.tar.gz diff --git a/build/pkgs/arb/package-version.txt b/build/pkgs/arb/package-version.txt index b2242a0ff1c..cf8690732fe 100644 --- a/build/pkgs/arb/package-version.txt +++ b/build/pkgs/arb/package-version.txt @@ -1 +1 @@ -2.16.0.p0 +2.18.0 diff --git a/build/pkgs/arb/spkg-install.in b/build/pkgs/arb/spkg-install.in index 4aa200a2b91..9322f04c912 100644 --- a/build/pkgs/arb/spkg-install.in +++ b/build/pkgs/arb/spkg-install.in @@ -1,9 +1,5 @@ cd src -# The git head of arb now honors LDFLAGS; The following workaround can -# be removed in arb >= 2.8 when it is released -export EXTRA_SHARED_FLAGS=$LDFLAGS - # Trac #29607: We must always supply --with-gmp, --with-mpfr, # --with-flint because otherwise ARB's configure script uses # /usr/local, which is always wrong.