From a6cc75b8344a7fab80e2218442b1eab9f11790811628cabbe2443c03c10c21aa Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 25 Jun 2021 22:21:09 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/science/polymake?expand=0&rev=14 --- polymake.changes | 6 +++- polymake.spec | 12 ++++---- unbundle.diff | 74 ------------------------------------------------ 3 files changed, 10 insertions(+), 82 deletions(-) delete mode 100644 unbundle.diff diff --git a/polymake.changes b/polymake.changes index 011d66e..56ee8fc 100644 --- a/polymake.changes +++ b/polymake.changes @@ -1,7 +1,11 @@ ------------------------------------------------------------------- Tue Jun 22 15:59:55 UTC 2021 - Jan Engelhardt -- Add sympol-system.patch, bliss077.patch +- Add sympol-system.patch to adjust include paths for + a `make installed` sympol. +- Add bliss077.patch to enable compilation for newer versions + of bliss. +- Drop unbundle.diff, one can actually use configure arguments. ------------------------------------------------------------------- Mon Jun 21 18:20:10 UTC 2021 - Jan Engelhardt diff --git a/polymake.spec b/polymake.spec index 98eadd5..a103e19 100644 --- a/polymake.spec +++ b/polymake.spec @@ -17,7 +17,6 @@ %define lname libpolymake4_4 -%define _lto_cflags %nil Name: polymake Version: 4.4 Release: 0 @@ -27,9 +26,8 @@ Group: Productivity/Scientific/Math URL: https://polymake.org/ Source: https://github.com/polymake/polymake/archive/V%version.tar.gz -Patch1: unbundle.diff -Patch2: bliss077.patch -Patch3: sympol-system.patch +Patch1: bliss077.patch +Patch2: sympol-system.patch BuildRequires: bliss-devel BuildRequires: cddlib-devel BuildRequires: flint-devel @@ -38,7 +36,7 @@ BuildRequires: gmp-devel >= 4.2 BuildRequires: libboost_headers-devel BuildRequires: libxml2-tools BuildRequires: libxslt-tools -BuildRequires: lrslib-devel >= 0.7.0 +BuildRequires: lrslib-devel >= 7.1b BuildRequires: memory-constraints BuildRequires: mpfr-devel BuildRequires: ninja @@ -88,8 +86,8 @@ objects, and other objects. # Not AC. ./configure --prefix="%_prefix" --libdir="%_libdir" \ --libexecdir="%_libdir/%name-%version" --without-native \ - --with-bliss=/usr \ - CFLAGS="%optflags" CXXFLAGS="%optflags" CXXOPT="%optflags" + --with-bliss=/usr --with-sympol=/usr --with-cdd=/usr --with-permlib=/usr --with-lrs=/usr \ + CFLAGS="%optflags" CXXFLAGS="%optflags -g0" CXXOPT="%optflags" # can't replace limit_build by _constraints file: # * asking memoryperjob=3400 -> unsatisfiable i586 workers # (github.com/openSUSE/open-build-service/issues/10167) diff --git a/unbundle.diff b/unbundle.diff deleted file mode 100644 index a0704f3..0000000 --- a/unbundle.diff +++ /dev/null @@ -1,74 +0,0 @@ -From: Jan Engelhardt -Date: 2021-06-24 00:08:26.352878902 +0200 - ---- - bundled/bliss/support/configure.pl | 3 +++ - bundled/cdd/support/configure.pl | 2 +- - bundled/libnormaliz/support/configure.pl | 2 +- - bundled/lrs/support/configure.pl | 2 +- - bundled/sympol/support/configure.pl | 6 +++++- - 5 files changed, 11 insertions(+), 4 deletions(-) - -Index: polymake-4.4/bundled/cdd/support/configure.pl -=================================================================== ---- polymake-4.4.orig/bundled/cdd/support/configure.pl -+++ polymake-4.4/bundled/cdd/support/configure.pl -@@ -40,7 +40,7 @@ sub proceed { - my ($options)=@_; - my $cdd_path; - my $cddversion; -- $UseBundled = 1; -+ $UseBundled = 0; - - if (defined ($cdd_path=$options->{cdd}) and $cdd_path ne "bundled") { - my $cdd_inc="$cdd_path/include"; -Index: polymake-4.4/bundled/libnormaliz/support/configure.pl -=================================================================== ---- polymake-4.4.orig/bundled/libnormaliz/support/configure.pl -+++ polymake-4.4/bundled/libnormaliz/support/configure.pl -@@ -39,7 +39,7 @@ sub proceed { - my $nmz_path; - my $nmz_version; - my $libs = "-lnormaliz"; -- $UseBundled=1; -+ $UseBundled = 0; - - # check GMP C++ bindings - my $build_error=Polymake::Configure::build_test_program(<<'---', LIBS => "-lgmpxx -lgmp"); -Index: polymake-4.4/bundled/lrs/support/configure.pl -=================================================================== ---- polymake-4.4.orig/bundled/lrs/support/configure.pl -+++ polymake-4.4/bundled/lrs/support/configure.pl -@@ -41,7 +41,7 @@ sub proceed { - my $lrs_inc = $options->{'lrs-include'}; - my $lrs_version; - my $lrs_libname = "lrs"; -- $UseBundled = 1; -+ $UseBundled = 0; - # suppress lrs output when it was built without LRS_QUIET - # 1: use /dev/null as output stream instead of nullptr - # 2: also redirect stdout because of gmp v.?.? -Index: polymake-4.4/bundled/sympol/support/configure.pl -=================================================================== ---- polymake-4.4.orig/bundled/sympol/support/configure.pl -+++ polymake-4.4/bundled/sympol/support/configure.pl -@@ -39,7 +39,9 @@ sub check_bundled { - sub proceed { - my ($options)=@_; - my $sympol_path; -- $UseBundled = 1; -+ $UseBundled = 0; -+ -+if (0) { - - if (defined ($sympol_path=$options->{sympol}) and $sympol_path ne "bundled") { - if (-f "$sympol_path/include/sympol/symmetrycomputation.h") { -@@ -141,6 +143,8 @@ int main() { - } - } - -+} -+ - if ($UseBundled) { - die "bundled sympol requested but it cannot be found" - unless check_bundled();