Skip to content

typo + guava #40519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Aug 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion build/pkgs/gap_packages/spkg-install.in
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ install_compiled_pkg()
#
# These packages have an old ./configure that take the GAP_ROOT as a positional
# argument
for pkg in cohomolo crypting grape guava orb datastructures
for pkg in cohomolo crypting grape orb datastructures
do
echo "Building GAP package $pkg"
CFLAGS="$CFLAGS -Wno-implicit-function-declaration"
Expand All @@ -104,6 +104,14 @@ do
cd "$PKG_SRC_DIR"
done

echo "Building GAP package guava"
export CFLAGS="-std=gnu17 $CFLAGS -Wno-implicit-function-declaration"
cd "$PKG_SRC_DIR/guava"
./configure "$GAP_ROOT"
sdh_make
install_compiled_pkg "guava"
cd "$PKG_SRC_DIR"

# These packages have a new-style autoconf ./configure
# that takes --with-gaproot

Expand Down
22 changes: 22 additions & 0 deletions build/pkgs/qhull/patches/qhull_cmake.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
*** src/CMakeLists.txt.orig Thu May 8 13:21:24 2025
--- src/CMakeLists.txt Thu May 8 13:25:39 2025
***************
*** 67,74 ****
# $Id: //main/2019/qhull/CMakeLists.txt#21 $$Change: 3039 $
# $DateTime: 2020/09/03 21:26:22 $$Author: bbarber $

project(qhull)
- cmake_minimum_required(VERSION 3.0)

# Define qhull_VERSION in README.txt, Announce.txt, qh-get.htm, CMakeLists.txt
# qhull-zip.sh (twice), qhull-wiki.md, qhull-news.htm, File_id.diz, index.htm
--- 67,75 ----
# $Id: //main/2019/qhull/CMakeLists.txt#21 $$Change: 3039 $
# $DateTime: 2020/09/03 21:26:22 $$Author: bbarber $

+ cmake_minimum_required(VERSION 3.25...4.0.3)
+
project(qhull)

# Define qhull_VERSION in README.txt, Announce.txt, qh-get.htm, CMakeLists.txt
# qhull-zip.sh (twice), qhull-wiki.md, qhull-news.htm, File_id.diz, index.htm
4 changes: 2 additions & 2 deletions build/pkgs/symengine/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=symengine-VERSION.tar.gz
sha1=2dfee07108509963f3dbe3d9cad9de76d85e551f
sha256=f6972acd6a65354f6414e69460d2e175729470632bdac05919bc2f7f32e48cbd
sha1=e53aa2677bcad5a5dc075a94d4a4f9ef95b5fe07
sha256=11c5f64e9eec998152437f288b8429ec001168277d55f3f5f1df78e3cf129707
upstream_url=https://github.com/symengine/symengine/releases/download/vVERSION/symengine-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/symengine/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.11.2
0.14.0
Loading