diff --git a/polymake-lrs-system-fix.patch b/polymake-lrs-system-fix.patch index 46bbd76..e01b594 100644 --- a/polymake-lrs-system-fix.patch +++ b/polymake-lrs-system-fix.patch @@ -1,5 +1,5 @@ ---- bundled/lrs/configure.pl.orig 2016-01-25 06:34:27.000000000 -0700 -+++ bundled/lrs/configure.pl 2016-02-11 21:04:10.649938417 -0700 +--- bundled/lrs/configure.pl.orig 2017-01-11 07:41:13.165154107 -0700 ++++ bundled/lrs/configure.pl 2017-01-11 08:16:04.631713597 -0700 @@ -17,14 +17,16 @@ sub allowed_options { @@ -19,14 +19,13 @@ } sub check_bundled { -@@ -39,19 +41,34 @@ sub proceed { +@@ -39,18 +41,32 @@ sub proceed { if (defined ($lrs_path=$options->{lrs}) and $lrs_path ne "bundled") { my $lrs_inc="$lrs_path/include"; - my $lrs_lib=Polymake::Configure::get_libdir($lrs_path, "lrs"); - if (-f "$lrs_inc/lrslib.h" && -f "$lrs_lib/liblrsgmp.$Config::Config{so}" ) { - $CXXflags="-I$lrs_inc"; -- $LDflags="-L$lrs_lib -Wl,-rpath,$lrs_lib"; - } elsif (-f "$lrs_inc/lrslib.h" && -f "$lrs_lib/liblrsgmp.a" ) { + if (-f "$lrs_inc/lrslib.h") { $CXXflags="-I$lrs_inc"; @@ -40,9 +39,8 @@ + my $lrs_lib=Polymake::Configure::get_libdir($lrs_path, "lrsgmp"); + if (-f "$lrs_lib/liblrsgmp.$Config::Config{so}" ) { + $LDflags = "-L$lrs_lib"; -+ $LDflags .= " -Wl,-rpath,$lrs_lib" unless ($lrs_path eq "/usr"); -+ } -+ ++ } ++ + if (!$CXXflags or !$LDflags) { + die "Invalid installation location of lrslib: header file lrslib.h and/or library liblrsgmp.$Config::Config{so} not found.\n", + "You might try to use --with-lrs-include and --with-lrs-lib.\n"; @@ -55,7 +53,6 @@ + $cdd_path .= "include: $lrs_inc "; + } + if (defined ($cdd_lib=$options->{'lrs-lib'})) { -+ $LDflags = "-L$lrs_lib -Wl,-rpath,$lrs_lib"; + $cdd_path .= "lib: $lrs_lib"; + } + diff --git a/polymake-ppl.patch b/polymake-ppl.patch index 705d74c..3a15b2f 100644 --- a/polymake-ppl.patch +++ b/polymake-ppl.patch @@ -10,7 +10,7 @@ #include --- bundled/ppl/configure.pl.orig 2016-12-08 17:48:00.114445495 -0700 +++ bundled/ppl/configure.pl 2016-12-08 20:02:45.612143460 -0700 -@@ -42,6 +42,7 @@ sub proceed { +@@ -41,6 +41,7 @@ sub proceed { } my $error=Polymake::Configure::build_test_program(<<"---", Libs => "-lppl -lgmp", CXXflags => "$CXXflags", LDflags => "$LDflags"); #include