diff -up polymake-2.15-beta2/bundled/group/apps/polytope/src/Makefile.inc.fedora polymake-2.15-beta2/bundled/group/apps/polytope/src/Makefile.inc
--- polymake-2.15-beta2/bundled/group/apps/polytope/src/Makefile.inc.fedora 2015-08-26 09:21:17.527018401 -0400
+++ polymake-2.15-beta2/bundled/group/apps/polytope/src/Makefile.inc 2015-08-26 09:23:11.372298151 -0400
@@ -1,15 +1,11 @@
ifeq (${ImportedIntoExtension},)
- StaticLibs := sympol
+ # StaticLibs := sympol
- sympol_interface$O : ExtraCXXFLAGS += -I${ExtensionTop}/external/sympol
- sympol_raycomputation_beneathbeyond$O : ExtraCXXFLAGS += -I${ExtensionTop}/external/sympol
- sympol_raycomputation_ppl$O : ExtraCXXFLAGS += -I${ExtensionTop}/external/sympol
+ sympol_interface$O : ExtraCXXFLAGS += -I/usr/include/sympol
+ sympol_raycomputation_beneathbeyond$O : ExtraCXXFLAGS += -I/usr/include/sympol
+ sympol_raycomputation_ppl$O : ExtraCXXFLAGS += -I/usr/include/sympol
- LIBS += ${BuildDir}/staticlib/sympol/libsympol$A $(subst %A,${A},${CddLib} ${LrsLib})
-endif
-
-ifneq ($(filter 4.4%,${GCCversion}),)
- universal_polytope_ilps$O : ExtraCXXFLAGS += -O1
+ LIBS += -lsympol -lcddgmp
endif
# Local Variables:
diff -up polymake-2.15-beta2/bundled/group/configure.pl.fedora polymake-2.15-beta2/bundled/group/configure.pl
--- polymake-2.15-beta2/bundled/group/configure.pl.fedora 2015-08-26 09:16:29.000000000 -0400
+++ polymake-2.15-beta2/bundled/group/configure.pl 2015-08-26 09:21:17.527018401 -0400
@@ -28,7 +28,7 @@ sub proceed {
my ($options)=@_;
my $boost_path;
# everything can include permlib headers
- $CXXflags='-I${ExtensionTop}/external/permlib/include';
+ $CXXflags='-I/usr/include/permlib';
if (defined ($boost_path=$options->{boost})) {
$boost_path .= '/include' if (-d "$boost_path/include/boost");
diff -up polymake-2.15-beta2/bundled/group/staticlib/sympol/Makefile.inc.fedora polymake-2.15-beta2/bundled/group/staticlib/sympol/Makefile.inc
--- polymake-2.15-beta2/bundled/group/staticlib/sympol/Makefile.inc.fedora 2015-08-26 09:16:29.000000000 -0400
+++ polymake-2.15-beta2/bundled/group/staticlib/sympol/Makefile.inc 2015-08-26 09:21:17.527018401 -0400
@@ -5,7 +5,7 @@ src := $(ExtensionTop)/external/sympol/s
vpath %.cpp $(src)
-libsympol : ExtraCXXFLAGS := -I$(ExtensionTop)/external/permlib/include -I$(ExtensionTop)/external/sympol/sympol $(LrsCflags) -DGMP -DLRS_QUIET $(CddCflags) -DGMPRATIONAL
+libsympol : ExtraCXXFLAGS := -I/usr/include/permlib -I/usr/include/sympol $(LrsCflags) -DGMP -DLRS_QUIET $(CddCflags) -DGMPRATIONAL
# Local Variables:
# mode: Makefile
diff -up polymake-2.15-beta2/bundled/libnormaliz/apps/polytope/src/Makefile.inc.fedora polymake-2.15-beta2/bundled/libnormaliz/apps/polytope/src/Makefile.inc
--- polymake-2.15-beta2/bundled/libnormaliz/apps/polytope/src/Makefile.inc.fedora 2015-08-26 09:16:29.000000000 -0400
+++ polymake-2.15-beta2/bundled/libnormaliz/apps/polytope/src/Makefile.inc 2015-08-26 09:21:17.528018396 -0400
@@ -1,4 +1,5 @@
- ExtraCXXFLAGS = -I$(ExtensionTop)/external/libnormaliz
+ ExtraCXXFLAGS = -I/usr/include/libnormaliz
+ LIBS += -lnormaliz
# Local Variables:
# mode: Makefile
diff -up polymake-2.15-beta2/bundled/libnormaliz/apps/polytope/src/normaliz.cc.fedora polymake-2.15-beta2/bundled/libnormaliz/apps/polytope/src/normaliz.cc
--- polymake-2.15-beta2/bundled/libnormaliz/apps/polytope/src/normaliz.cc.fedora 2015-08-26 09:16:29.000000000 -0400
+++ polymake-2.15-beta2/bundled/libnormaliz/apps/polytope/src/normaliz.cc 2015-08-26 09:21:17.528018396 -0400
@@ -36,7 +36,7 @@ namespace libnormaliz {
}
}
-#include "libnormaliz-all.cpp"
+#include <libnormaliz/cone.h>
namespace libnormaliz {
template<> inline long explicit_cast_to_long(const pm::Integer& a) {
diff -up polymake-2.15-beta2/perl/polymake-config.fedora polymake-2.15-beta2/perl/polymake-config
--- polymake-2.15-beta2/perl/polymake-config.fedora 2015-08-26 09:16:29.000000000 -0400
+++ polymake-2.15-beta2/perl/polymake-config 2015-08-26 09:21:17.528018396 -0400
@@ -125,9 +125,6 @@ while (defined ($_=shift)) {
} elsif ($_ eq "--ldflags") {
my $ldflags=$conf{LDflags};
- if ($ldflags !~ /(?:^|\s)-L$conf{InstallLib}(?:\s|$)/) {
- $ldflags="-L$conf{InstallLib} $ldflags";
- }
my $add_rpath=1;
open CF, ">$tmpfile.cc" or die "can't create temporary file $tmpfile.cc: $!\n";
print CF "int main() { return 0; }\n";
@@ -145,8 +142,6 @@ while (defined ($_=shift)) {
close CC;
if ($^O eq "darwin") {
$ldflags="$conf{ARCHFLAGS} $ldflags -flat_namespace";
- } elsif ($add_rpath) {
- $ldflags.=" -Wl,-rpath,$conf{InstallLib}";
}
$ldflags=~s/^\s+//; $ldflags=~s/\s+$//; $ldflags=~s/\s{2,}/ /g;
if ($debug_asked=defined($debug)) {
diff -up polymake-2.15-beta2/support/configure.pl.fedora polymake-2.15-beta2/support/configure.pl
--- polymake-2.15-beta2/support/configure.pl.fedora 2015-08-26 09:16:29.000000000 -0400
+++ polymake-2.15-beta2/support/configure.pl 2015-08-26 09:21:17.528018396 -0400
@@ -388,7 +388,7 @@ if (defined $CC) {
print "ok ($CXX is ", defined($GCCversion) ? "GCC $GCCversion" : defined($CLANGversion) ? "CLANG $CLANGversion" : "ICC $ICCversion", ")\n";
$PERL =$vars{PERL} || $^X;
-$CXXOPT =$vars{CXXOPT} || "-O3";
+$CXXOPT =$vars{CXXOPT} || "-O2";
$CXXDEBUG =$vars{CXXDEBUG} || "";
$Cflags =$vars{CFLAGS} || "";
$CXXflags =$vars{CXXFLAGS} || $Cflags;
@@ -578,10 +578,6 @@ if (defined $GMP) {
$CXXflags .= " -I$GMP/include";
my $libdir=get_libdir($GMP, "gmp");
$LDflags .= " -L$libdir";
- if (($^O ne "darwin" || $options{fink} eq ".none.") && exists $options{gmp}) {
- # non-standard location
- $LDflags .= " -Wl,-rpath,$libdir";
- }
}
my $MPFR=$options{mpfr};
@@ -590,10 +586,6 @@ if (defined($MPFR) && $MPFR ne $GMP) {
$CXXflags .= " -I$MPFR/include";
my $libdir=get_libdir($MPFR, "mpfr");
$LDflags .= " -L$libdir";
- if ($^O ne "darwin" || $options{fink} eq ".none.") {
- # non-standard location
- $LDflags .= " -Wl,-rpath,$libdir";
- }
}
if ($check_prereq) {