Skip to content

Commit bcdffce

Browse files
author
Release Manager
committed
sagemathgh-40519: typo + guava
This tries to take into account sagemath#40484. @enriqueartal: Could you test it? ### ⌛ Dependencies Built on top of sagemath#40512. URL: sagemath#40519 Reported by: Guillermo Moreno-Socías Reviewer(s): Dima Pasechnik, Enrique Manuel Artal Bartolo
2 parents 94fe540 + e7f3ac9 commit bcdffce

File tree

6 files changed

+37
-7
lines changed

6 files changed

+37
-7
lines changed

build/pkgs/configure/checksums.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=eb43008c539589aa31cdb6ec98b47a2c43c60486
3-
sha256=3f7b71621144bf2c62983c5276e00fe941e2be8f33005ae4594c269b71bccd1b
2+
sha1=25a8760d6e1d7cf502e271f996c6fe9cd121cfe0
3+
sha256=a3502812eeeb38ffaca2dd0b88ef800ff4c48f01be7d09392888d055e421f60f
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1e5e8e6b859ca8064b05738793074b5695012653
1+
0805225cb49c8676c8d86750c675d5f81227640d

build/pkgs/gap_packages/spkg-install.in

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ install_compiled_pkg()
9292
#
9393
# These packages have an old ./configure that take the GAP_ROOT as a positional
9494
# argument
95-
for pkg in cohomolo crypting grape guava orb datastructures
95+
for pkg in cohomolo crypting grape orb datastructures
9696
do
9797
echo "Building GAP package $pkg"
9898
CFLAGS="$CFLAGS -Wno-implicit-function-declaration"
@@ -104,6 +104,14 @@ do
104104
cd "$PKG_SRC_DIR"
105105
done
106106

107+
echo "Building GAP package guava"
108+
export CFLAGS="-std=gnu17 $CFLAGS -Wno-implicit-function-declaration"
109+
cd "$PKG_SRC_DIR/guava"
110+
./configure "$GAP_ROOT"
111+
sdh_make
112+
install_compiled_pkg "guava"
113+
cd "$PKG_SRC_DIR"
114+
107115
# These packages have a new-style autoconf ./configure
108116
# that takes --with-gaproot
109117

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
*** src/CMakeLists.txt.orig Thu May 8 13:21:24 2025
2+
--- src/CMakeLists.txt Thu May 8 13:25:39 2025
3+
***************
4+
*** 67,74 ****
5+
# $Id: //main/2019/qhull/CMakeLists.txt#21 $$Change: 3039 $
6+
# $DateTime: 2020/09/03 21:26:22 $$Author: bbarber $
7+
8+
project(qhull)
9+
- cmake_minimum_required(VERSION 3.0)
10+
11+
# Define qhull_VERSION in README.txt, Announce.txt, qh-get.htm, CMakeLists.txt
12+
# qhull-zip.sh (twice), qhull-wiki.md, qhull-news.htm, File_id.diz, index.htm
13+
--- 67,75 ----
14+
# $Id: //main/2019/qhull/CMakeLists.txt#21 $$Change: 3039 $
15+
# $DateTime: 2020/09/03 21:26:22 $$Author: bbarber $
16+
17+
+ cmake_minimum_required(VERSION 3.25...4.0.3)
18+
+
19+
project(qhull)
20+
21+
# Define qhull_VERSION in README.txt, Announce.txt, qh-get.htm, CMakeLists.txt
22+
# qhull-zip.sh (twice), qhull-wiki.md, qhull-news.htm, File_id.diz, index.htm

build/pkgs/symengine/checksums.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=symengine-VERSION.tar.gz
2-
sha1=2dfee07108509963f3dbe3d9cad9de76d85e551f
3-
sha256=f6972acd6a65354f6414e69460d2e175729470632bdac05919bc2f7f32e48cbd
2+
sha1=e53aa2677bcad5a5dc075a94d4a4f9ef95b5fe07
3+
sha256=11c5f64e9eec998152437f288b8429ec001168277d55f3f5f1df78e3cf129707
44
upstream_url=https://github.com/symengine/symengine/releases/download/vVERSION/symengine-VERSION.tar.gz
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.11.2
1+
0.14.0

0 commit comments

Comments
 (0)