Replace various --with-gmp=$SAGE_LOCAL flags in spkg-installs with a

$SAGE_CONFIGURE_GMP variable that is defined in sage-env-config and set at configure time.
sagemath · Apr 18, 2019 · 299e367 · 299e367
1 parent 8a16493
commit 299e367
Show file tree

Hide file tree

Showing 22 changed files with 43 additions and 29 deletions.
diff --git a/build/pkgs/4ti2/spkg-install b/build/pkgs/4ti2/spkg-install
@@ -1,7 +1,7 @@
 cd src/
 CFLAGS="-I $SAGE_LOCAL/include -L$SAGE_LOCAL/lib $CFLAGS"
 export CFLAGS
-sdh_configure --with-gmp=$SAGE_LOCAL --with-glpk=$SAGE_LOCAL \
+sdh_configure $SAGE_CONFIGURE_GMP --with-glpk=$SAGE_LOCAL \
     --enable-shared=yes --enable-static=no
 sdh_make
 sdh_make_install
diff --git a/build/pkgs/arb/spkg-install b/build/pkgs/arb/spkg-install
@@ -4,8 +4,8 @@ cd src
 # be removed in arb >= 2.8 when it is released
 export EXTRA_SHARED_FLAGS=$LDFLAGS
 
-./configure --disable-static --prefix="$SAGE_LOCAL" --with-flint="$SAGE_LOCAL" \
-    --with-gmp="$SAGE_LOCAL" --with-mpfr="$SAGE_LOCAL" || \
+./configure --disable-static --prefix="$SAGE_LOCAL" $SAGE_CONFIGURE_GMP \
+            --with-flint="$SAGE_LOCAL" --with-mpfr="$SAGE_LOCAL" || \
     sdh_die "Error configuring arb."
 
 sdh_make verbose

diff --git a/build/pkgs/barvinok/spkg-install b/build/pkgs/barvinok/spkg-install
@@ -1,6 +1,10 @@
 cd src
 
-sdh_configure --with-gmp-prefix=${SAGE_LOCAL} \
+if [ -n "$SAGE_GMP_PREFIX" ];
+   GMP_CONFIGURE="--with-gmp-prefix=$SAGE_GMP_PREFIX"
+fi
+
+sdh_configure $GMP_CONFIGURE \
               --with-ntl-prefix=${SAGE_LOCAL} \
               --with-isl=system               \
               --with-polylib=system           \

diff --git a/build/pkgs/deformation/spkg-install b/build/pkgs/deformation/spkg-install
@@ -3,7 +3,7 @@ cd src
 # Note: Not actually an autoconf-generated configure; doesn't support
 # all standard flags, so we can't use sdh_configure
 ./configure --prefix="$SAGE_LOCAL" --disable-static \
-            --with-gmp="$SAGE_LOCAL" --with-mpfr="$SAGE_LOCAL" \
+            $SAGE_CONFIGURE_GMP --with-mpfr="$SAGE_LOCAL" \
             --with-flint="$SAGE_LOCAL" || \
             sdh_die "Failed to configure deformation"
 sdh_make

diff --git a/build/pkgs/ecl/spkg-install b/build/pkgs/ecl/spkg-install
@@ -37,7 +37,7 @@ echo ""
 # Use newer version of config.guess and config.sub (see Trac #19732)
 cp "$SAGE_ROOT"/config/config.* src
 
-sdh_configure --with-gmp-prefix=$SAGE_LOCAL --disable-threads \
+sdh_configure $SAGE_CONFIGURE_GMP --disable-threads \
               --enable-unicode=yes $ECL_CONFIGURE
 
 # Before running make we touch build/TAGS so its building process is never triggered

diff --git a/build/pkgs/ecm/spkg-install b/build/pkgs/ecm/spkg-install
@@ -210,7 +210,10 @@ else
 fi
 echo "  --prefix=\"$SAGE_LOCAL\""
 echo "  --libdir=\"$SAGE_LOCAL/lib\""
-echo "  --with-gmp=\"$SAGE_LOCAL\""
+if [ -n "$SAGE_GMP_CONFIGURE" ]; then
+    echo "  --with-gmp=\"$SAGE_LOCAL\""
+fi
+
 for opt in $ECM_CONFIGURE; do
     echo "  $opt"
 done
@@ -221,7 +224,7 @@ if [ -z "$ECM_CONFIGURE" ]; then
 fi
 echo
 
-sdh_configure --with-gmp="$SAGE_LOCAL" $ECM_CONFIGURE
+sdh_configure $SAGE_CONFIGURE_GMP $ECM_CONFIGURE
 
 ###############################################################################
 # Now build ECM:

diff --git a/build/pkgs/flint/spkg-install b/build/pkgs/flint/spkg-install
@@ -16,7 +16,7 @@ echo "Configuring FLINT."
 ./configure \
     --disable-static \
     --prefix="$SAGE_LOCAL" \
-    --with-gmp="$SAGE_LOCAL" \
+    $SAGE_CONFIGURE_GMP \
     --with-mpfr="$SAGE_LOCAL" \
     --with-ntl="$SAGE_LOCAL" \
     $FLINT_CONFIGURE || sdh_die "Error: Failed to configure FLINT."

diff --git a/build/pkgs/gap/spkg-install b/build/pkgs/gap/spkg-install
@@ -17,7 +17,7 @@ else
     export CFLAGS="-O2 -g $CFLAGS"
 fi
 
-sdh_configure --with-gmp="$SAGE_LOCAL"
+sdh_configure $SAGE_CONFIGURE_GMP
 sdh_make -j1
 
 # GAP's "make install" is work in progress; we use bits and pieces of it

diff --git a/build/pkgs/gcc/build-gcc b/build/pkgs/gcc/build-gcc
@@ -61,7 +61,7 @@ fi
 ../src/configure \
     --prefix="$SAGE_LOCAL" \
     --with-local-prefix="$SAGE_LOCAL" \
-    --with-gmp="$SAGE_LOCAL" --with-mpfr="$SAGE_LOCAL" --with-mpc="$SAGE_LOCAL" \
+    $SAGE_CONFIGURE_GMP --with-mpfr="$SAGE_LOCAL" --with-mpc="$SAGE_LOCAL" \
     --with-system-zlib \
     --disable-multilib \
     --disable-nls \

diff --git a/build/pkgs/gdb/spkg-install b/build/pkgs/gdb/spkg-install
@@ -6,6 +6,6 @@ export LDFLAGS="${LDFLAGS} -L${SAGE_LOCAL}/lib -ltinfo"
 sdh_configure \
     --with-mpc="$SAGE_LOCAL" \
     --with-mpfr="$SAGE_LOCAL" \
-    --with-gmp="$SAGE_LOCAL"
+    $SAGE_CONFIGURE_GMP
 sdh_make
 sdh_make_install
diff --git a/build/pkgs/givaro/spkg-install b/build/pkgs/givaro/spkg-install
@@ -9,6 +9,6 @@ if [ "$SAGE_FAT_BINARY" = yes ]; then
     GIVARO_CONFIGURE="--disable-sse --disable-sse2 --disable-sse3 --disable-ssse3 --disable-sse41 --disable-sse42 --disable-fma --disable-fma4 --disable-avx --disable-avx2  $GIVARO_CONFIGURE"
 fi
 
-sdh_configure --with-gmp="$SAGE_LOCAL" --enable-shared $GIVARO_CONFIGURE
+sdh_configure $SAGE_CONFIGURE_GMP --enable-shared $GIVARO_CONFIGURE
 sdh_make
 sdh_make_install
diff --git a/build/pkgs/glpk/spkg-install b/build/pkgs/glpk/spkg-install
@@ -6,7 +6,7 @@ cp "$SAGE_ROOT"/config/config.* .
 # Note: The following doesn't work with spaces in `$SAGE_LOCAL`, but we don't
 #       support that anyway, since many upstream packages don't.
 #       On the other hand, the only packages GLPK uses that Sage provides are
-#       GMP/MPIR and zlib, so we should just use `--with-gmp="$SAGE_LOCAL"` and
+#       GMP/MPIR and zlib, so we should just use `$SAGE_CONFIGURE_GMP` and
 #       `--with-zlib="$SAGE_LOCAL"` below (which is safe), and omit the fol-
 #       lowing two lines. (TODO)
 #

diff --git a/build/pkgs/latte_int/spkg-install b/build/pkgs/latte_int/spkg-install
@@ -1,7 +1,7 @@
 cd src
 
 sdh_configure --enable-shared=yes --enable-static=false \
-              --with-gmp=$SAGE_LOCAL --with-ntl=$SAGE_LOCAL \
+              $SAGE_CONFIGURE_GMP --with-ntl=$SAGE_LOCAL \
               --with-cddlib=$SAGE_LOCAL --with-4ti2=$SAGE_LOCAL \
               --with-lidia=$SAGE_LOCAL
 sdh_make

diff --git a/build/pkgs/mpc/spkg-install b/build/pkgs/mpc/spkg-install
@@ -13,7 +13,7 @@ if [ $UNAME = "CYGWIN" ]; then
 fi
 
 # Building
-sdh_configure --with-gmp="$SAGE_LOCAL" --with-mpfr="$SAGE_LOCAL" $EXTRA
+sdh_configure $SAGE_CONFIGURE_GMP --with-mpfr="$SAGE_LOCAL" $EXTRA
 sdh_make
 
 # Cleaning

diff --git a/build/pkgs/mpfi/spkg-install b/build/pkgs/mpfi/spkg-install
@@ -5,7 +5,7 @@ cd src
 # Use newer version of config.guess and config.sub (see Trac #19716)
 cp "$SAGE_ROOT"/config/config.* .
 
-sdh_configure --with-mpfr="$SAGE_LOCAL" --with-gmp="$SAGE_LOCAL"
+sdh_configure --with-mpfr="$SAGE_LOCAL" $SAGE_CONFIGURE_GMP
 sdh_make
 sdh_make_install
 

diff --git a/build/pkgs/mpfr/spkg-install b/build/pkgs/mpfr/spkg-install
@@ -57,7 +57,7 @@ mpfr_configure()
     ###########################################################################
     echo "Checking what CC and CFLAGS MPFR would use if they were empty..."
     if (unset CC CFLAGS CPPFLAGS CXXFLAGS &&
-        ./configure --with-gmp="$SAGE_LOCAL" $SAGE_CONF_OPTS $MPFR_CONFIGURE) &>/dev/null;
+        ./configure $SAGE_CONFIGURE_GMP $SAGE_CONF_OPTS $MPFR_CONFIGURE) &>/dev/null;
     then
         mpfr_config_file=config.status
         if mpfr_get_upstream_selected_cflags "$mpfr_config_file"; then
@@ -131,16 +131,18 @@ mpfr_configure()
     fi
     echo "  --prefix=\"$SAGE_LOCAL\""
     echo "  --libdir=\"$SAGE_LOCAL/lib\""
-    echo "  --with-gmp=\"$SAGE_LOCAL\""
+    if [ -n "$SAGE_CONFIGURE_GMP" ]; then
+        echo "  --with-gmp=\"$SAGE_LOCAL\""
+    fi
+
     for opt in $SAGE_CONF_OPTS $MPFR_CONFIGURE; do
         echo "  $opt"
     done
     if [ -z "$MPFR_CONFIGURE" ]; then
         echo "You can set MPFR_CONFIGURE to pass additional parameters."
     fi
 
-    sdh_configure --with-gmp="$SAGE_LOCAL" \
-                $SAGE_CONF_OPTS $MPFR_CONFIGURE
+    sdh_configure $SAGE_CONFIGURE_GMP $SAGE_CONF_OPTS $MPFR_CONFIGURE
 }
 
 mpfr_build()

diff --git a/build/pkgs/mpfrcx/spkg-install b/build/pkgs/mpfrcx/spkg-install
@@ -1,6 +1,6 @@
 cd src
 
-sdh_configure --with-gmp="$SAGE_LOCAL" --with-mpfr="$SAGE_LOCAL" \
+sdh_configure $SAGE_CONFIGURE_GMP --with-mpfr="$SAGE_LOCAL" \
               --with-mpc="$SAGE_LOCAL" --disable-static --enable-shared
 sdh_make
 sdh_make_install
diff --git a/build/pkgs/pari/spkg-install b/build/pkgs/pari/spkg-install
@@ -132,8 +132,9 @@ export CFLAGS
 # anyway, it doesn't hurt either. -- jdemeyer
 #
 # Note that "--graphic=none" is (usually) added to PARI_CONFIGURE:
+#--with-gmp-include="/usr/include/x86_64-linux-gnu" \
 bash ./Configure --prefix="$SAGE_LOCAL" \
-    --with-readline="$SAGE_LOCAL" --with-gmp="$SAGE_LOCAL" \
+    --with-readline="$SAGE_LOCAL" $SAGE_CONFIGURE_GMP \
     --with-runtime-perl="/usr/bin/env perl" \
     --kernel=gmp $PARI_CONFIGURE || \
     sdh_die "Error configuring PARI with readline and GMP kernel failed."

diff --git a/build/pkgs/ppl/spkg-install b/build/pkgs/ppl/spkg-install
@@ -4,19 +4,17 @@ export CXXFLAGS="$CXXFLAGS -I$SAGE_LOCAL/include"
 cd src
 
 # Enable only what's needed for Sage
-GMP_PATHS=( "--with-gmp-include=$SAGE_LOCAL/include"
-"--with-gmp-lib=$SAGE_LOCAL/lib" )
 PPL_CONFIGURE="--enable-coefficients=mpz --disable-fpmath $PPL_CONFIGURE"
 
 # First try configuring both the C and C++ interfaces.
 # If that fails (for example, because of a broken version of m4),
 # try to configure again with only the C++ interface, which is
 # sufficient for Sage.  See #11391 and #12672.
-if ! (sdh_configure --enable-interfaces=c,c++ "${GMP_PATHS[@]}" \
+if ! (sdh_configure --enable-interfaces=c,c++ $SAGE_CONFIGURE_GMP \
                     $PPL_CONFIGURE); then
     echo >&2 "Error configuring PPL with both C and C++ interfaces, trying"
     echo >&2 "again with only the C++ interface."
-    sdh_configure --enable-interfaces=c++ "${GMP_PATHS[@]}" $PPL_CONFIGURE
+    sdh_configure --enable-interfaces=c++ $SAGE_CONFIGURE_GMP $PPL_CONFIGURE
 fi
 
 # Workaround to disable PPL's "watchdog timer", preventing it from clobbering

diff --git a/build/pkgs/singular/spkg-install b/build/pkgs/singular/spkg-install
@@ -77,7 +77,7 @@ config()
     #    may be ignored.
     sdh_configure --exec-prefix="$SAGE_LOCAL" \
                   --bindir="$SAGE_LOCAL/bin" \
-                  --with-gmp="$SAGE_LOCAL" \
+                  $SAGE_CONFIGURE_GMP \
                   --with-ntl="$SAGE_LOCAL" \
                   --with-flint="$SAGE_LOCAL" \
                   --enable-gfanlib \

diff --git a/build/pkgs/topcom/spkg-install b/build/pkgs/topcom/spkg-install
@@ -8,7 +8,7 @@ cd src
 ./configure \
     --prefix="$SAGE_LOCAL" \
     --libdir="$SAGE_LOCAL/lib" \
-    --with-gmp="$SAGE_LOCAL" \
+    $SAGE_CONFIGURE_GMP \
     --with-cdd="$SAGE_LOCAL"
 if [ $? -ne 0 ]; then
    echo "Error configuring TOPCOM."

diff --git a/src/bin/sage-env-config.in b/src/bin/sage-env-config.in
@@ -35,3 +35,9 @@ export SAGE_PYTHON_VERSION=@SAGE_PYTHON_VERSION@
 if [ "$SAGE_PYTHON_VERSION" = 3 ]; then
     export SAGE_PYTHON3=yes
 fi
+
+# This is usually blank if the system GMP is used, or $SAGE_LOCAL otherwise
+export SAGE_GMP_PREFIX="@SAGE_GMP_PREFIX@"
+if [ -n "$SAGE_GMP_PREFIX" ]; then
+    export SAGE_CONFIGURE_GMP="--with-gmp=$SAGE_GMP_PREFIX"
+fi