[arch-commits] Commit in gap/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Saturday, November 26, 2016 @ 19:41:11
  Author: arojas
Revision: 196945

Fix build of guava package

Modified:
  gap/trunk/PKGBUILD

----------+
 PKGBUILD |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-11-26 19:34:39 UTC (rev 196944)
+++ PKGBUILD	2016-11-26 19:41:11 UTC (rev 196945)
@@ -7,7 +7,7 @@
 pkgname=(gap gap-data gap-doc gap-packages)
 pkgver=4.8.6
 _gapver=4r8p6_2016_11_12-14_25
-pkgrel=1
+pkgrel=2
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete algebra"
 arch=(i686 x86_64)
 url="http://www.gap-system.org/"
@@ -22,6 +22,10 @@
 
 # Use system normaliz
   sed -e '/build-normaliz.sh/d' -i bin/BuildPackages.sh
+# Fix build if guava package
+  sed -e "s|MAKE=make|MAKE='make -j1'|" -i bin/BuildPackages.sh
+  sed -e '/cd leon make/d' -i pkg/guava-*/src/Makefile
+  sed -e '/AM_INIT_AUTOMAKE/d' -i pkg/guava-*/src/leon/configure.ac
 # Don't load any packages by default
   patch -p1 -i ../gap-no-packages-by-default.patch
 }
@@ -34,12 +38,9 @@
   cd pkg
   sh ../bin/BuildPackages.sh
 # These packages fail to build:
-# carat
 # float (doesn't support fplll 5)
 # fr https://github.com/gap-packages/fr/issues/16
-# guava
 # linboxing (doesn't support givaro 4)
-# qaos 
 
   cd ../etc
   sh install-tools.sh
@@ -62,11 +63,13 @@
   install -m755 "$pkgdir"/usr/lib/gap/bin/gap.sh "$pkgdir"/usr/bin/gap
 
 # fix location
-  sed -e 's|/build/gap/src/gap4r8|/usr/lib/gap|' -i "$pkgdir"/usr/bin/gap  
+  sed -e 's|/build/gap/src/gap4r8|/usr/lib/gap|' -i "$pkgdir"/usr/bin/gap -i "$pkgdir"/usr/lib/gap/bin/*/sysinfo.gap  
+
 # remove unneeded stuff
   rm "$pkgdir"/usr/lib/gap/bin/*/*.o
   rm "$pkgdir"/usr/lib/gap/bin/gap.sh
   find "$pkgdir"/usr/lib/gap/bin/ -maxdepth 1 -type f -exec rm {} \;
+  rm -r "$pkgdir"/usr/lib/gap/bin/*/{config*,extern,gac,Makefile}
 }
 
 package_gap-data() {