Skip to content

Commit 6ded2a3

Browse files
gmou3gmou3
committed
Update ccache to 4.10.2
1 parent f48da11 commit 6ded2a3

File tree

17 files changed

+67
-77
lines changed

17 files changed

+67
-77
lines changed

Diff for: ‎build/bin/sage-dist-helpers

+6-7
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,9 @@
7171
#
7272
# - sdh_cmake [...]
7373
#
74-
# Runs `cmake` in the current directory with the given arguments, as well as
75-
# additional arguments passed to cmake (assuming packages are using the
76-
# GNUInstallDirs module) so that `CMAKE_INSTALL_PREFIX` and
77-
# `CMAKE_INSTALL_LIBDIR` are set correctly.
74+
# Runs `cmake` with the given arguments, as well as additional arguments
75+
# (assuming packages are using the GNUInstallDirs module) so that
76+
# `CMAKE_INSTALL_PREFIX` and `CMAKE_INSTALL_LIBDIR` are set correctly.
7877
#
7978
# - sdh_install [-T] SRC [SRC...] DEST
8079
#
@@ -416,9 +415,9 @@ sdh_pip_uninstall() {
416415

417416
sdh_cmake() {
418417
echo "Configuring $PKG_NAME with cmake"
419-
cmake . -DCMAKE_INSTALL_PREFIX="${SAGE_INST_LOCAL}" \
420-
-DCMAKE_INSTALL_LIBDIR=lib \
421-
"$@"
418+
cmake -DCMAKE_INSTALL_PREFIX="${SAGE_INST_LOCAL}" \
419+
-DCMAKE_INSTALL_LIBDIR=lib \
420+
"$@"
422421
if [ $? -ne 0 ]; then
423422
if [ -f "$(pwd)/CMakeFiles/CMakeOutput.log" ]; then
424423
sdh_die <<_EOF_

Diff for: ‎build/pkgs/bliss/spkg-install.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ if [ "$UNAME" = "Darwin" ]; then
33
export LDFLAGS
44
fi
55
cd src
6-
sdh_cmake -DUSE_GMP=OFF -DCMAKE_VERBOSE_MAKEFILE=ON
6+
sdh_cmake -DUSE_GMP=OFF -DCMAKE_VERBOSE_MAKEFILE=ON .
77
sdh_make
88
sdh_make_install

Diff for: ‎build/pkgs/ccache/checksums.ini

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

Diff for: ‎build/pkgs/ccache/dependencies

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
zlib
1+
cmake xz
22

33
----------
44
All lines of this file are ignored except the first.

Diff for: ‎build/pkgs/ccache/distros/arch.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ccache

Diff for: ‎build/pkgs/ccache/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.4
1+
4.10.2

Diff for: ‎build/pkgs/ccache/patches/01-apple-gcc-id.patch

-15
This file was deleted.

Diff for: ‎build/pkgs/ccache/spkg-install.in

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
cd src
22

3-
# Use newer version of config.guess and config.sub (see Issue #23710)
4-
cp "$SAGE_ROOT"/config/config.* .
5-
6-
export CPPFLAGS="-I$SAGE_LOCAL/include $CPPFLAGS"
7-
sdh_configure
3+
mkdir build
4+
cd build
5+
sdh_cmake -DCMAKE_BUILD_TYPE=Release \
6+
-DENABLE_TESTING=OFF \
7+
-DREDIS_STORAGE_BACKEND=OFF \
8+
..
89
sdh_make
910
sdh_make_install
1011

11-
1212
set -e
1313

1414
mkdir -p "$SAGE_LOCAL/libexec/ccache"
@@ -21,4 +21,4 @@ ln -sf ../../bin/ccache "$SAGE_LOCAL/libexec/ccache/clang++"
2121

2222
# Copy a reasonable default configuration for Sage
2323
# (cache size of 4G and compression enabled)
24-
cp -p ../ccache.conf "$SAGE_LOCAL/etc"
24+
cp -p ../../ccache.conf "$SAGE_LOCAL/etc"

Diff for: ‎build/pkgs/dsdp/spkg-install.in

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ sdh_cmake -DCMAKE_BUILD_TYPE=Release \
55
-DBUILD_SHARED_LIBS=ON \
66
-DBLA_VENDOR=OpenBLAS \
77
-DBLAS_LIBRARIES="$(pkg-config --libs blas)" \
8-
-DLAPACK_LIBRARIES="$(pkg-config --libs lapack)"
8+
-DLAPACK_LIBRARIES="$(pkg-config --libs lapack)" \
9+
.
910
sdh_make
1011
sdh_make_install

Diff for: ‎build/pkgs/primecount/spkg-install.in

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ sdh_cmake -DCMAKE_VERBOSE_MAKEFILE=ON \
3636
-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=BOTH \
3737
-DCMAKE_INSTALL_PREFIX=$SAGE_LOCAL \
3838
-DWITH_POPCNT=OFF \
39+
. \
3940
&& sdh_make_install
4041
}
4142

Diff for: ‎build/pkgs/primesieve/spkg-install.in

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ sdh_cmake -DCMAKE_VERBOSE_MAKEFILE=ON \
99
-DBUILD_STATIC_LIBS=OFF \
1010
-DBUILD_SHARED_LIBS=ON \
1111
-DBUILD_TESTS=ON \
12-
${EXTRA_OPTS}
12+
${EXTRA_OPTS} \
13+
.
1314

1415
sdh_make_install

Diff for: ‎build/pkgs/qhull/spkg-install.in

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
cd src/
22

33
sdh_cmake -DCMAKE_VERBOSE_MAKEFILE=ON \
4-
-DLIB_INSTALL_DIR="${SAGE_LOCAL}"/lib
4+
-DLIB_INSTALL_DIR="${SAGE_LOCAL}"/lib \
5+
.
56

67
sdh_make
78

Diff for: ‎build/pkgs/scip/spkg-install.in

+11-11
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ cd src
22
mkdir build
33
cd build
44
sdh_cmake -DCMAKE_INSTALL_LIBDIR=lib \
5-
-DCMAKE_VERBOSE_MAKEFILE=ON \
6-
-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON \
7-
-DGMP_DIR="${SAGE_GMP_PREFIX}" \
8-
-DReadline_ROOT_DIR=$(pkg-config --variable=prefix readline) \
9-
-DHistory_ROOT_DIR=$(pkg-config --variable=prefix readline) \
10-
-DIPOPT=off \
11-
-DPAPILO=on -DPAPILO_DIR="${SAGE_LOCAL}" \
12-
-DZIMPL=off \
13-
-DAMPL=off \
14-
-DSYM=bliss \
15-
..
5+
-DCMAKE_VERBOSE_MAKEFILE=ON \
6+
-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON \
7+
-DGMP_DIR="${SAGE_GMP_PREFIX}" \
8+
-DReadline_ROOT_DIR=$(pkg-config --variable=prefix readline) \
9+
-DHistory_ROOT_DIR=$(pkg-config --variable=prefix readline) \
10+
-DIPOPT=off \
11+
-DPAPILO=on -DPAPILO_DIR="${SAGE_LOCAL}" \
12+
-DZIMPL=off \
13+
-DAMPL=off \
14+
-DSYM=bliss \
15+
..
1616
sdh_make
1717
sdh_make_install

Diff for: ‎build/pkgs/scip_sdp/spkg-install.in

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ cd src
22
mkdir build
33
cd build
44
sdh_cmake -DCMAKE_INSTALL_LIBDIR=lib \
5-
-DCMAKE_VERBOSE_MAKEFILE=ON \
6-
-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON \
7-
-DBLA_VENDOR=OpenBLAS \
8-
-DBLAS_LIBRARIES="$(pkg-config --libs blas)" \
9-
-DLAPACK_LIBRARIES="$(pkg-config --libs lapack)" \
10-
-DSCIP_DIR="${SAGE_LOCAL}" \
11-
-DSYM=bliss \
12-
-DSDPS=dsdp \
13-
..
5+
-DCMAKE_VERBOSE_MAKEFILE=ON \
6+
-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON \
7+
-DBLA_VENDOR=OpenBLAS \
8+
-DBLAS_LIBRARIES="$(pkg-config --libs blas)" \
9+
-DLAPACK_LIBRARIES="$(pkg-config --libs lapack)" \
10+
-DSCIP_DIR="${SAGE_LOCAL}" \
11+
-DSYM=bliss \
12+
-DSDPS=dsdp \
13+
..
1414
sdh_make
1515
sdh_make_install

Diff for: ‎build/pkgs/suitesparse/spkg-install.in

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ echo "Configuring suitesparse"
55
# Hopefully these sill be normalised in the future.
66
# * SUITESPARSE_INCLUDEDIR_POSTFIX sets the subfolder in which to install headers.
77
# It default to "suitesparse" if not defined, which currently breaks dependencies.
8-
# * SUITESPARSE_USE_FORTRAN make sure the fortran interface is off. There is trouble when
8+
# * SUITESPARSE_USE_FORTRAN make sure the fortran interface is off. There is trouble when
99
# gcc and gfortran version are not matching.
1010
# * SUITESPARSE_ENABLE_PROJECTS semi column separated list of the desired packages. Default is
1111
# all the packages in the suitesparse tarball.
@@ -16,6 +16,7 @@ sdh_cmake -DCMAKE_VERBOSE_MAKEFILE=ON \
1616
-DNSTATIC=ON \
1717
-DSUITESPARSE_USE_FORTRAN=OFF \
1818
-DSUITESPARSE_INCLUDEDIR_POSTFIX="" \
19-
-DSUITESPARSE_ENABLE_PROJECTS="suitesparse_config;amd;camd;ccolamd;colamd;cholmod;umfpack"
19+
-DSUITESPARSE_ENABLE_PROJECTS="suitesparse_config;amd;camd;ccolamd;colamd;cholmod;umfpack" \
20+
.
2021

2122
sdh_make_install

Diff for: ‎build/pkgs/symengine/spkg-install.in

+12-12
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ cd src
22
mkdir build
33
cd build
44
sdh_cmake -DCMAKE_PREFIX_PATH="$SAGE_LOCAL" \
5-
-DWITH_SYMENGINE_THREAD_SAFE=yes \
6-
-DWITH_ECM=yes \
7-
-DWITH_FLINT=yes \
8-
-DWITH_ARB=yes \
9-
-DWITH_MPFR=yes \
10-
-DWITH_MPC=yes \
11-
-DWITH_LLVM=no \
12-
-DINTEGER_CLASS="flint" \
13-
-DBUILD_BENCHMARKS=no \
14-
-DBUILD_SHARED_LIBS=yes \
15-
-DBUILD_TESTS=yes \
16-
..
5+
-DWITH_SYMENGINE_THREAD_SAFE=yes \
6+
-DWITH_ECM=yes \
7+
-DWITH_FLINT=yes \
8+
-DWITH_ARB=yes \
9+
-DWITH_MPFR=yes \
10+
-DWITH_MPC=yes \
11+
-DWITH_LLVM=no \
12+
-DINTEGER_CLASS="flint" \
13+
-DBUILD_BENCHMARKS=no \
14+
-DBUILD_SHARED_LIBS=yes \
15+
-DBUILD_TESTS=yes \
16+
..
1717

1818
sdh_make
1919
sdh_make install

Diff for: ‎src/doc/en/developer/packaging.rst

+4-5
Original file line numberDiff line numberDiff line change
@@ -497,11 +497,10 @@ should not need to add it yourself.
497497
498498
The following are also available, but rarely used.
499499
500-
- ``sdh_cmake [...]``: Runs ``cmake`` in the current directory with
501-
the given arguments, as well as additional arguments passed to
502-
cmake (assuming packages are using the GNUInstallDirs module) so
503-
that ``CMAKE_INSTALL_PREFIX`` and ``CMAKE_INSTALL_LIBDIR`` are set
504-
correctly.
500+
- ``sdh_cmake [...]``: Runs ``cmake`` in the current directory with the given
501+
arguments, as well as additional arguments (assuming packages are using the
502+
GNUInstallDirs module) so that ``CMAKE_INSTALL_PREFIX`` and
503+
``CMAKE_INSTALL_LIBDIR`` are set correctly.
505504
506505
- ``sdh_preload_lib EXECUTABLE SONAME``: (Linux only -- no-op on other
507506
platforms.) Check shared libraries loaded by ``EXECUTABLE`` (may be a

0 commit comments

Comments
 (0)