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

[Antonio Rojas]

    Date: Thursday, November 24, 2016 @ 22:05:46
  Author: arojas
Revision: 196757

Fix build of some packages

Modified:
  gap/trunk/PKGBUILD

----------+
 PKGBUILD |   43 +++++++++++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-11-24 21:53:36 UTC (rev 196756)
+++ PKGBUILD	2016-11-24 22:05:46 UTC (rev 196757)
@@ -5,26 +5,44 @@
 
 pkgbase=gap
 pkgname=(gap gap-data gap-doc gap-packages)
-pkgver=4.8.6
-pkgrel=1
+pkgver=4.8.3
+_gapver=4r8p3_2016_03_19-22_17
+pkgrel=4
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete algebra"
 arch=(i686 x86_64)
 url="http://www.gap-system.org/"
 license=(GPL)
-source=("http://www.gap-system.org/pub/gap/gap48/tar.gz/gap4r8p6_2016_11_12-14_25.tar.gz")
-sha256sums=('a9df4c49b2feb5dd7b8c4f093f6558bdd7a6c1b3f5f64971c4d9e74828eb0cd4')
+source=("http://www.gap-system.org/pub/gap/gap48/tar.gz/gap$_gapver.tar.gz")
+sha256sums=('667fbbe4b6f2626b799b977a4ca12e9373e0878a6771a94d217bab412405abe6')
+makedepends=(libxaw libxt openmpi givaro mpfi fplll normaliz polymake)
 
+prepare() {
+  cd gap4r8
+# Fix build of cohomolo package
+  sed -e 's|cd cohomolo|cd cohomolo*|' -i bin/BuildPackages.sh
+}
+
 build() {
   cd gap4r8
-  ./configure --prefix=/usr --with-gmp=system
+  CC=mpicc ./configure --prefix=/usr --with-gmp=system
   make
 
   cd pkg
-  ../bin/BuildPackages.sh
+  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
 }
 
 package_gap() {
-  depends=(gmp)
+  depends=(gmp openmpi)
   optdepends=('gap-packages: extra packages' 'gap-data: additional databases' 'gap-doc: documentation')
   replaces=(gap-math)
   conflicts=(gap-math)
@@ -31,16 +49,20 @@
   cd gap4r8
   
   mkdir -p "$pkgdir"/usr/lib/gap
-  cp -r bin etc grp lib tst CITATION "$pkgdir"/usr/lib/gap
+  cp -r bin etc grp lib CITATION "$pkgdir"/usr/lib/gap
   
   mkdir -p "$pkgdir"/usr/lib/gap/pkg
   cp -r pkg/GAPDoc-* "$pkgdir"/usr/lib/gap/pkg
 
   mkdir -p "$pkgdir"/usr/bin
-  ln -s /usr/lib/gap/bin/gap.sh "$pkgdir"/usr/bin/gap
+  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/lib/gap/bin/gap.sh  
+  sed -e 's|/build/gap/src/gap4r8|/usr/lib/gap|' -i "$pkgdir"/usr/bin/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 {} \;
 }
 
 package_gap-data() {
@@ -63,6 +85,7 @@
 
 package_gap-packages() {
   depends=(gap)
+  optdepends=('normaliz: Normaliz interface package' 'polymake: Polymake interface package' 'libxaw: xgap package')
   pkgdesc="Extra packages for GAP"
   cd gap4r8