[arch-commits] Commit in polymake/trunk (PKGBUILD polymake-no-znow.patch)

[Antonio Rojas]

    Date: Monday, December 4, 2017 @ 10:04:41
  Author: arojas
Revision: 272108

Rebuild with perl 5.26.1 (FS#56236), disable -z,now and -no-plt to fix undefined symbols

Added:
  polymake/trunk/polymake-no-znow.patch
Modified:
  polymake/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   14 ++++++++++----
 polymake-no-znow.patch |   11 +++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-04 09:59:05 UTC (rev 272107)
+++ PKGBUILD	2017-12-04 10:04:41 UTC (rev 272108)
@@ -2,18 +2,19 @@
 
 pkgname=polymake
 pkgver=3.1
-pkgrel=4
+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 bliss-graphs ppl apache-ant boost singular)
+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')
+        gcc7.patch polymake-no-znow.patch)
 sha256sums=('f751e3c34e5ee3a015a99d1151b357130f15878c0bcea82827a19a12009e7fc0'
-            'e93c6d16a13b2701c999ff076fd6510f024b130cd47db2f86f096864b52ae37c')
+            'e93c6d16a13b2701c999ff076fd6510f024b130cd47db2f86f096864b52ae37c'
+            'e56b49bfb60bdb2fc91d267efe09731f65d1f0a469322530bcc409b60fdb6578')
 
 prepare() {
   cd polymake-$pkgver
@@ -22,10 +23,15 @@
   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
 }

Added: polymake-no-znow.patch
===================================================================
--- polymake-no-znow.patch	                        (rev 0)
+++ polymake-no-znow.patch	2017-12-04 10:04:41 UTC (rev 272108)
@@ -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 ... ";