Merge branch 'develop' into meson-macos

Author: tobiasdiez

CITATION.cff

@@ -4,8 +4,8 @@ title: SageMath
 abstract: SageMath is a free open-source mathematics software system.
 authors:
 - name: "The SageMath Developers"
-version: 10.6.beta1
+version: 10.6.beta2
 doi: 10.5281/zenodo.8042260
-date-released: 2024-12-15
+date-released: 2024-12-22
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"

VERSION.txt

@@ -1 +1 @@
-SageMath version 10.6.beta1, Release Date: 2024-12-15
+SageMath version 10.6.beta2, Release Date: 2024-12-22

build/bin/sage-dist-helpers

@@ -71,10 +71,9 @@
 #
 # - sdh_cmake [...]
 #
-#    Runs `cmake` in the current directory with the given arguments, as well as
-#    additional arguments passed to cmake (assuming packages are using the
-#    GNUInstallDirs module) so that `CMAKE_INSTALL_PREFIX` and
-#    `CMAKE_INSTALL_LIBDIR` are set correctly.
+#    Runs `cmake` with the given arguments, as well as additional arguments
+#    (assuming packages are using the GNUInstallDirs module) so that
+#    `CMAKE_INSTALL_PREFIX` and `CMAKE_INSTALL_LIBDIR` are set correctly.
 #
 # - sdh_install [-T] SRC [SRC...] DEST
 #
@@ -416,9 +415,9 @@ sdh_pip_uninstall() {
 
 sdh_cmake() {
     echo "Configuring $PKG_NAME with cmake"
-    cmake . -DCMAKE_INSTALL_PREFIX="${SAGE_INST_LOCAL}" \
-            -DCMAKE_INSTALL_LIBDIR=lib \
-            "$@"
+    cmake -DCMAKE_INSTALL_PREFIX="${SAGE_INST_LOCAL}" \
+          -DCMAKE_INSTALL_LIBDIR=lib \
+          "$@"
     if [ $? -ne 0 ]; then
         if [ -f "$(pwd)/CMakeFiles/CMakeOutput.log" ]; then
             sdh_die <<_EOF_

build/pkgs/bliss/spkg-install.in

@@ -3,6 +3,6 @@ if [ "$UNAME" = "Darwin" ]; then
     export LDFLAGS
 fi
 cd src
-sdh_cmake -DUSE_GMP=OFF -DCMAKE_VERBOSE_MAKEFILE=ON
+sdh_cmake -DUSE_GMP=OFF -DCMAKE_VERBOSE_MAKEFILE=ON .
 sdh_make
 sdh_make_install

build/pkgs/ccache/checksums.ini

@@ -1,3 +1,4 @@
-tarball=ccache-VERSION.tar.bz2
-sha1=3653e0765f01697c449f7026c479fbd9526323a7
-sha256=fa9d7f38367431bc86b19ad107d709ca7ecf1574fdacca01698bdf0a47cd8567
+tarball=ccache-VERSION.tar.xz
+sha1=cff97f7592f5042eb43cb54a6d12a1ce7e49da62
+sha256=c0b85ddfc1a3e77b105ec9ada2d24aad617fa0b447c6a94d55890972810f0f5a
+upstream_url=https://github.com/ccache/ccache/releases/download/vVERSION/ccache-VERSION.tar.xz

build/pkgs/ccache/dependencies

@@ -1,4 +1,4 @@
-zlib
+cmake xz
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/ccache/distros/arch.txt

@@ -0,0 +1 @@
+ccache

build/pkgs/ccache/package-version.txt

@@ -1 +1 @@
-3.3.4
+4.10.2

build/pkgs/ccache/patches/01-apple-gcc-id.patch

@@ -1,14 +1,14 @@
 cd src
 
-# Use newer version of config.guess and config.sub (see Issue #23710)
-cp "$SAGE_ROOT"/config/config.* .
-
-export CPPFLAGS="-I$SAGE_LOCAL/include $CPPFLAGS"
-sdh_configure
+mkdir build
+cd build
+sdh_cmake -DCMAKE_BUILD_TYPE=Release \
+          -DENABLE_TESTING=OFF \
+		  -DREDIS_STORAGE_BACKEND=OFF \
+		  ..
 sdh_make
 sdh_make_install
 
-
 set -e
 
 mkdir -p "$SAGE_LOCAL/libexec/ccache"
@@ -21,4 +21,4 @@ ln -sf ../../bin/ccache "$SAGE_LOCAL/libexec/ccache/clang++"
 
 # Copy a reasonable default configuration for Sage
 # (cache size of 4G and compression enabled)
-cp -p ../ccache.conf "$SAGE_LOCAL/etc"
+cp -p ../../ccache.conf "$SAGE_LOCAL/etc"