Date: Monday, December 4, 2017 @ 10:05:17
Author: arojas
Revision: 272109
archrelease: copy trunk to community-x86_64
Added:
polymake/repos/community-x86_64/PKGBUILD
(from rev 272108, polymake/trunk/PKGBUILD)
polymake/repos/community-x86_64/gcc7.patch
(from rev 272108, polymake/trunk/gcc7.patch)
polymake/repos/community-x86_64/polymake-no-znow.patch
(from rev 272108, polymake/trunk/polymake-no-znow.patch)
Deleted:
polymake/repos/community-x86_64/PKGBUILD
polymake/repos/community-x86_64/gcc7.patch
------------------------+
PKGBUILD | 78 +++++++++++++++++++++++++----------------------
gcc7.patch | 26 +++++++--------
polymake-no-znow.patch | 11 ++++++
3 files changed, 66 insertions(+), 49 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-12-04 10:04:41 UTC (rev 272108)
+++ PKGBUILD 2017-12-04 10:05:17 UTC (rev 272109)
@@ -1,36 +0,0 @@
-# Maintainer: Antonio Rojas <aro...@archlinux.org>
-
-pkgname=polymake
-pkgver=3.1
-pkgrel=4
-pkgdesc="Open source software for research in polyhedral geometry"
-arch=(i686 x86_64)
-url="https://polymake.org/";
-license=(GPL)
-depends=(mpfr perl-xml-writer perl-xml-libxml perl-xml-libxslt
perl-term-readline-gnu perl-term-readkey)
-makedepends=(normaliz cddlib lrs bliss-graphs ppl apache-ant boost singular)
-optdepends=('singular: ideal library' 'ppl: polytope library' 'java-runtime:
java module')
-source=("https://polymake.org/lib/exe/fetch.php/download/polymake-$pkgver-minimal.tar.bz2";
- 'gcc7.patch')
-sha256sums=('f751e3c34e5ee3a015a99d1151b357130f15878c0bcea82827a19a12009e7fc0'
- 'e93c6d16a13b2701c999ff076fd6510f024b130cd47db2f86f096864b52ae37c')
-
-prepare() {
- cd polymake-$pkgver
- patch -Np0 -i ../gcc7.patch
-# fix lrs headers location
- sed -e 's|lrslib.h|lrslib/lrslib.h|g' -i
bundled/lrs/apps/polytope/src/lrs_interface.cc \
- -i bundled/sympol/external/sympol/sympol/raycomputationlrs.cpp
- sed -e 's|<lrslib.h>|<lrslib/lrslib.h>|g' -e
's|\$lrs_path\/include|$lrs_path/include/lrslib|g' -i bundled/lrs/configure.pl
-}
-
-build() {
- cd polymake-$pkgver
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd polymake-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: polymake/repos/community-x86_64/PKGBUILD (from rev 272108,
polymake/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-12-04 10:05:17 UTC (rev 272109)
@@ -0,0 +1,42 @@
+# Maintainer: Antonio Rojas <aro...@archlinux.org>
+
+pkgname=polymake
+pkgver=3.1
+pkgrel=5
+pkgdesc="Open source software for research in polyhedral geometry"
+arch=(x86_64)
+url="https://polymake.org/";
+license=(GPL)
+depends=(mpfr perl-xml-writer perl-xml-libxml perl-xml-libxslt
perl-term-readline-gnu perl-term-readkey)
+makedepends=(normaliz cddlib lrs ppl apache-ant boost singular bliss-graphs)
+optdepends=('singular: ideal library' 'ppl: polytope library' 'java-runtime:
java module')
+source=("https://polymake.org/lib/exe/fetch.php/download/polymake-$pkgver-minimal.tar.bz2";
+ gcc7.patch polymake-no-znow.patch)
+sha256sums=('f751e3c34e5ee3a015a99d1151b357130f15878c0bcea82827a19a12009e7fc0'
+ 'e93c6d16a13b2701c999ff076fd6510f024b130cd47db2f86f096864b52ae37c'
+ 'e56b49bfb60bdb2fc91d267efe09731f65d1f0a469322530bcc409b60fdb6578')
+
+prepare() {
+ cd polymake-$pkgver
+ patch -Np0 -i ../gcc7.patch
+# fix lrs headers location
+ sed -e 's|lrslib.h|lrslib/lrslib.h|g' -i
bundled/lrs/apps/polytope/src/lrs_interface.cc \
+ -i bundled/sympol/external/sympol/sympol/raycomputationlrs.cpp
+ sed -e 's|<lrslib.h>|<lrslib/lrslib.h>|g' -e
's|\$lrs_path\/include|$lrs_path/include/lrslib|g' -i bundled/lrs/configure.pl
+# Fix undefined symbols
+ patch -p1 -i ../polymake-no-znow.patch
+}
+
+build() {
+ cd polymake-$pkgver
+ export LDFLAGS=${LDFLAGS/,-z,now} # Fix undefined symbols
+ export CFLAGS=${CFLAGS/-fno-plt}
+ export CXXFLAGS=${CXXFLAGS/-fno-plt}
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd polymake-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Deleted: gcc7.patch
===================================================================
--- gcc7.patch 2017-12-04 10:04:41 UTC (rev 272108)
+++ gcc7.patch 2017-12-04 10:05:17 UTC (rev 272109)
@@ -1,13 +0,0 @@
---- lib/core/include/Graph.h.orig 2017-03-28 03:30:14.000000000 -0600
-+++ lib/core/include/Graph.h 2017-03-28 21:33:36.040286583 -0600
-@@ -709,8 +709,8 @@ public:
- void swap(Table& t)
- {
- std::swap(R,t.R);
-- std::swap(node_maps, t.node_maps);
-- std::swap(edge_maps, t.edge_maps);
-+ node_maps.swap(t.node_maps);
-+ edge_maps.swap(t.edge_maps);
- std::swap(n_nodes, t.n_nodes);
- std::swap(free_node_id, t.free_node_id);
- std::swap(free_edge_ids, t.free_edge_ids);
Copied: polymake/repos/community-x86_64/gcc7.patch (from rev 272108,
polymake/trunk/gcc7.patch)
===================================================================
--- gcc7.patch (rev 0)
+++ gcc7.patch 2017-12-04 10:05:17 UTC (rev 272109)
@@ -0,0 +1,13 @@
+--- lib/core/include/Graph.h.orig 2017-03-28 03:30:14.000000000 -0600
++++ lib/core/include/Graph.h 2017-03-28 21:33:36.040286583 -0600
+@@ -709,8 +709,8 @@ public:
+ void swap(Table& t)
+ {
+ std::swap(R,t.R);
+- std::swap(node_maps, t.node_maps);
+- std::swap(edge_maps, t.edge_maps);
++ node_maps.swap(t.node_maps);
++ edge_maps.swap(t.edge_maps);
+ std::swap(n_nodes, t.n_nodes);
+ std::swap(free_node_id, t.free_node_id);
+ std::swap(free_edge_ids, t.free_edge_ids);
Copied: polymake/repos/community-x86_64/polymake-no-znow.patch (from rev
272108, polymake/trunk/polymake-no-znow.patch)
===================================================================
--- polymake-no-znow.patch (rev 0)
+++ polymake-no-znow.patch 2017-12-04 10:05:17 UTC (rev 272109)
@@ -0,0 +1,11 @@
+--- polymake-3.1/support/configure.pl.orig 2017-12-03 09:21:44.528067697
+0000
++++ polymake-3.1/support/configure.pl 2017-12-03 09:25:17.258583093 +0000
+@@ -450,6 +450,8 @@
+ $Libs =$vars{LIBS} || "";
+
+ $LDsharedFlags=$Config::Config{lddlflags};
++$LDsharedFlags =~ s/,-z,now//g;
+ $LDcallableFlags= $options{callable} eq ".none." ? "none" : "$LDsharedFlags
$Config::Config{ldflags}";
++$LDcallableFlags =~ s/,-z,now//g;
+
+ print "checking C++ library ... ";
