Skip to content

Commit b7cf06f

Browse files
committed
40519 new
1 parent 8705d57 commit b7cf06f

File tree

3 files changed

+32
-2
lines changed

3 files changed

+32
-2
lines changed

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
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)