forked from pool/polymake
Jan Engelhardt
3657bf9d8b
- Update to release 4.4 OBS-URL: https://build.opensuse.org/package/show/science/polymake?expand=0&rev=12
86 lines
2.9 KiB
Diff
86 lines
2.9 KiB
Diff
---
|
|
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/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
|
|
+++ 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();
|