SHA256
1
0
forked from pool/polymake

Reduce unbundle.diff; add descriptions to patches

OBS-URL: https://build.opensuse.org/package/show/science/polymake?expand=0&rev=13
This commit is contained in:
Jan Engelhardt 2021-06-24 09:42:36 +00:00 committed by Git OBS Bridge
parent 3657bf9d8b
commit 7f4b9ae603
4 changed files with 8 additions and 15 deletions

View File

@ -1,5 +1,7 @@
References: https://polymake.org/downloads/bliss077.patch
polymake 4.4 is a bit older than bliss 0.77 and so needs a patch to
get the compilation between the two going.
---
bundled/bliss/apps/graph/src/GraphIso.cc | 10 ++++++++++
1 file changed, 10 insertions(+)

View File

@ -88,6 +88,7 @@ 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"
# can't replace limit_build by _constraints file:
# * asking memoryperjob=3400 -> unsatisfiable i586 workers

View File

@ -1,7 +1,8 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2021-06-22 17:59:14.278243463 +0200
sympol installs files differently than you think.
sympol installs its header files all in /usr/include/sympol,
with no extra subdirectories. Adjust the polymake include directives.
---
bundled/sympol/apps/polytope/src/sympol_interface.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

View File

@ -1,3 +1,6 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2021-06-24 00:08:26.352878902 +0200
---
bundled/bliss/support/configure.pl | 3 +++
bundled/cdd/support/configure.pl | 2 +-
@ -6,20 +9,6 @@
bundled/sympol/support/configure.pl | 6 +++++-
5 files changed, 11 insertions(+), 4 deletions(-)
Index: polymake-4.4/bundled/bliss/support/configure.pl
===================================================================
--- polymake-4.4.orig/bundled/bliss/support/configure.pl
+++ polymake-4.4/bundled/bliss/support/configure.pl
@@ -26,6 +26,9 @@ sub usage {
}
sub proceed {
+ $LIBS = "-lbliss";
+ return "system";
+
my ($options)=@_;
my $bliss_path;
if (defined ($bliss_path=$options->{bliss})) {
Index: polymake-4.4/bundled/cdd/support/configure.pl
===================================================================
--- polymake-4.4.orig/bundled/cdd/support/configure.pl