Fix build of gambit

sagemath · Feb 27, 2018 · b3bcbc1 · b3bcbc1
1 parent 93020a4
commit b3bcbc1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 18 deletions.
diff --git a/build/pkgs/gambit/package-version.txt b/build/pkgs/gambit/package-version.txt
@@ -1 +1 @@
-15.1.1
+15.1.1.p0
diff --git a/build/pkgs/gambit/spkg-install b/build/pkgs/gambit/spkg-install
@@ -1,26 +1,17 @@
 cd src
 
-./configure --disable-gui --prefix="$SAGE_LOCAL" --libdir="$SAGE_LOCAL/lib"
-if [ $? -ne 0 ]; then
-    echo >&2 "Error configuring Gambit."
-    exit 1
-fi
+sdh_configure --disable-gui
+sdh_make
+sdh_make_install
 
-$MAKE
-if [ $? -ne 0 ]; then
-    echo >&2 "Error building Gambit."
-    exit 1
-fi
-
-$MAKE -j1 install
-if [ $? -ne 0 ]; then
-    echo >&2 "Error installing Gambit."
-    exit 1
-fi
 
 cd src/python
-sage-python23 setup.py --no-user-cfg build install
 
+# Remove outdated source file (https://github.com/gambitproject/gambit/pull/232)
+rm gambit/lib/libgambit.cpp
+
+# pip doesn't work (https://github.com/gambitproject/gambit/issues/207)
+sage-python23 setup.py --no-user-cfg build install
 if [ $? -ne 0 ]; then
     echo "Error installing Python API"
     exit 1