Trac #28973: Merge branch 'develop' into automorphism_inverse_notation

Author: Michael Jung

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.0, Release Date: 2020-01-01
+SageMath version 9.1.beta0, Release Date: 2020-01-10

build/pkgs/atlas/spkg-configure.m4

@@ -0,0 +1,8 @@
+SAGE_SPKG_CONFIGURE([atlas], [dnl use old test/installation procedure with env. variables
+    sage_spkg_install_atlas=yes
+    ], [
+    AC_REQUIRE([SAGE_SPKG_CONFIGURE_OPENBLAS])
+    AS_IF([test x"$with_blas" = xatlas], [
+      sage_require_openblas=no
+      sage_require_atlas=yes]) 
+])

build/pkgs/buckygen/checksums.ini

@@ -1,4 +1,4 @@
-tarball=buckygen-VERSION.tar.bz2
-sha1=db4fe52211e25b8964308f8bea19db32242c1f1d
-md5=d33ea8f76b95a69842a291f88ed501fb
-cksum=1430056194
+tarball=buckygen-VERSION.zip
+sha1=a106afecbd55ece18cd75b2e3be6720f5c599d79
+md5=ce46e081eaa23c1cb1004eafe24de831
+cksum=1392809973

build/pkgs/buckygen/package-version.txt

@@ -1 +1 @@
-1.0
+1.1

build/pkgs/buckygen/type

@@ -1 +1 @@
-experimental
+optional

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=284d626415148c6636dde0a5909552f3a16e9f6b
-md5=b15e3bbfbfe0fa9a682c2ec501da0e1e
-cksum=3567364664
+sha1=fef64fcd9915ea4f881bc5cfeecb8b3864bc555f
+md5=0b23947f22228ef6d5d1143a906cd4a6
+cksum=844195685

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-a86de04f598154b70466bc85b61473eaea26f3cb
+7140d0e7bb897e008d315fdcd371c11528aa70d3

build/pkgs/gsl/spkg-configure.m4

@@ -0,0 +1,21 @@
+SAGE_SPKG_CONFIGURE([gsl], [
+    m4_pushdef([SAGE_GSL_MINVER],["2.4"])
+    SAGE_SPKG_DEPCHECK([atlas openblas], [
+      PKG_CHECK_MODULES([GSL], [gsl >= $SAGE_GSL_MINVER], [
+        PKG_CHECK_VAR([GSLPCDIR], [gsl], [pcfiledir], [
+          AC_CONFIG_COMMANDS([GSLPCPROCESS], [
+            $SED -e 's/\${GSL_CBLAS_LIB}\ //' \
+                 -e 's/GSL_CBLAS_LIB.*/Requires: cblas/' $GSL_PC \
+                  > "$SAGE_LOCAL"/lib/pkgconfig/gsl.pc
+          ], [
+            SED=$ac_cv_path_SED
+            GSL_PC="$GSLPCDIR"/gsl.pc
+          ])
+        ], [
+        AC_MSG_WARN([Unable to locate the directory of gsl.pc. This should not happen!])
+       sage_spkg_install_gsl=yes
+       ])
+      ], [sage_spkg_install_gsl=yes])
+    ])
+    m4_popdef([SAGE_GSL_MINVER])
+])

build/pkgs/libbraiding/package-version.txt

@@ -1 +1 @@
-1.0
+1.0.p0

build/pkgs/libbraiding/spkg-install

@@ -1,19 +1,4 @@
 cd src
-
-./configure --prefix="$SAGE_LOCAL" --libdir="$SAGE_LOCAL/lib"
-if [ $? -ne 0 ]; then
-    echo >&2 "Error configuring libbraiding."
-    exit 1
-fi
-
-$MAKE
-if [ $? -ne 0 ]; then
-    echo >&2 "Error building libbraiding."
-    exit 1
-fi
-
-$MAKE -j1 install
-if [ $? -ne 0 ]; then
-    echo >&2 "Error installing libbraiding."
-    exit 1
-fi
+sdh_configure $LIBBRAIDING_CONFIGURE
+sdh_make
+sdh_make_install -j1