|
Jerry James |
ba7c267 |
--- ./apps/group/src/Makefile.inc.orig 2011-04-11 10:17:49.000000000 -0600
|
|
Jerry James |
ba7c267 |
+++ ./apps/group/src/Makefile.inc 2013-02-27 15:10:34.341168779 -0700
|
|
Jerry James |
ba7c267 |
@@ -1,4 +1,4 @@
|
|
Jerry James |
ba7c267 |
- ExtraCXXFLAGS = -I$(ProjectTop)/external/permlib/include
|
|
Jerry James |
ba7c267 |
+ ExtraCXXFLAGS = -I/usr/include/permlib
|
|
Jerry James |
ba7c267 |
|
|
Jerry James |
ba7c267 |
# Local Variables:
|
|
Jerry James |
ba7c267 |
# mode: Makefile
|
|
Jerry James |
ba7c267 |
--- ./apps/polytope/src/Makefile.inc.orig 2012-01-13 15:32:36.000000000 -0700
|
|
Jerry James |
ba7c267 |
+++ ./apps/polytope/src/Makefile.inc 2013-02-27 15:10:34.340168780 -0700
|
|
Jerry James |
ba7c267 |
@@ -1,17 +1,12 @@
|
|
Jerry James |
ba7c267 |
ifndef ExtensionTop
|
|
Jerry James |
ba7c267 |
- ExternalLibs := cdd lrs sympol
|
|
Jerry James |
ba7c267 |
-
|
|
Jerry James |
ba7c267 |
- lrs_interface$O : ExtraCXXFLAGS = -I$(ProjectTop)/external/lrs
|
|
Jerry James |
ba7c267 |
- cdd_interface$O : ExtraCXXFLAGS = -I$(ProjectTop)/external/cdd/lib-src-gmp $(call addinclude, $(ProjectTop)/ext_lib/cdd/globals_gmp.h)
|
|
Jerry James |
ba7c267 |
- cdd_float_interface$O : ExtraCXXFLAGS = -I$(ProjectTop)/external/cdd/lib-src
|
|
Jerry James |
ba7c267 |
-
|
|
Jerry James |
ba7c267 |
- ExtraCXXFLAGS += -I$(ProjectTop)/external/permlib/include
|
|
Jerry James |
ba7c267 |
- sympol_interface$O : ExtraCXXFLAGS += -I$(ProjectTop)/external/sympol
|
|
Jerry James |
ba7c267 |
+ lrs_interface$O : ExtraCXXFLAGS = -I/usr/include/lrslib
|
|
Jerry James |
ba7c267 |
+ cdd_interface$O : ExtraCXXFLAGS = -I/usr/include/cddlib $(call addinclude, $(ProjectTop)/ext_lib/cdd/globals_gmp.h)
|
|
Jerry James |
ba7c267 |
+ cdd_float_interface$O : ExtraCXXFLAGS = -I/usr/include/cddlib
|
|
Jerry James |
ba7c267 |
|
|
Jerry James |
ba7c267 |
- LIBS += $(BuildDir)/external/lrs/liblrsgmp$A $(BuildDir)/external/cdd/libcddgmp$A $(BuildDir)/external/cdd/libcdd$A $(BuildDir)/external/sympol/libsympol$A
|
|
Jerry James |
ba7c267 |
+ LIBS += -llrsgmp -lcddgmp -lcdd -lsympol
|
|
Jerry James |
ba7c267 |
endif
|
|
Jerry James |
ba7c267 |
|
|
Jerry James |
ba7c267 |
-ifneq ($(filter 4.4% 4.5%,${GCCversion}),)
|
|
Jerry James |
ba7c267 |
+ifneq ($(filter 4.4% 4.5% 4.6% 4.7% 4.8%,${GCCversion}),)
|
|
Jerry James |
ba7c267 |
core_point_algo$O rel_int_point$O pointed_part$O : ExtraCXXFLAGS += -fno-strict-aliasing
|
|
Jerry James |
ba7c267 |
endif
|
|
Jerry James |
ba7c267 |
|
|
Jerry James |
ba7c267 |
--- ./perl/polymake-config.orig 2011-05-30 16:51:45.000000000 -0600
|
|
Jerry James |
ba7c267 |
+++ ./perl/polymake-config 2013-02-27 15:14:32.177979991 -0700
|
|
Jerry James |
ba7c267 |
@@ -126,9 +126,6 @@ while (defined ($_=shift)) {
|
|
Jerry James |
ba7c267 |
|
|
Jerry James |
ba7c267 |
} elsif ($_ eq "--ldflags") {
|
|
Jerry James |
ba7c267 |
my $ldflags=$conf{LDflags};
|
|
Jerry James |
ba7c267 |
- if ($ldflags !~ /(?:^|\s)-L$conf{InstallLib}(?:\s|$)/) {
|
|
Jerry James |
ba7c267 |
- $ldflags="-L$conf{InstallLib} $ldflags";
|
|
Jerry James |
ba7c267 |
- }
|
|
Jerry James |
ba7c267 |
my $add_rpath=1;
|
|
Jerry James |
ba7c267 |
open CF, ">$tmpfile.cc" or die "can't create temporary file $tmpfile.cc: $!\n";
|
|
Jerry James |
ba7c267 |
print CF "int main() { return 0; }\n";
|
|
Jerry James |
ba7c267 |
@@ -146,8 +143,6 @@ while (defined ($_=shift)) {
|
|
Jerry James |
ba7c267 |
close CC;
|
|
Jerry James |
ba7c267 |
if ($^O eq "darwin") {
|
|
Jerry James |
ba7c267 |
$ldflags="$conf{ARCHFLAGS} $ldflags";
|
|
Jerry James |
ba7c267 |
- } elsif ($add_rpath) {
|
|
Jerry James |
ba7c267 |
- $ldflags.=" -Wl,-rpath,$conf{InstallLib}";
|
|
Jerry James |
ba7c267 |
}
|
|
Jerry James |
ba7c267 |
$ldflags=~s/^\s+//; $ldflags=~s/\s+$//; $ldflags=~s/\s{2,}/ /g;
|
|
Jerry James |
ba7c267 |
if ($debug_asked=defined($debug)) {
|
|
Jerry James |
ba7c267 |
--- ./support/corelib.make.orig 2012-03-02 15:37:49.000000000 -0700
|
|
Jerry James |
ba7c267 |
+++ ./support/corelib.make 2013-02-27 15:10:34.340168780 -0700
|
|
Jerry James |
ba7c267 |
@@ -90,7 +90,9 @@ ${CoreLib} : ${SharedObjects} ${Standalo
|
|
Jerry James |
ba7c267 |
ifneq (${LDcallableFlags},none)
|
|
Jerry James |
ba7c267 |
# no explicit dependence on XSObjects here because they are built in compile-xs using the Makefile generated by xsubpp
|
|
Jerry James |
ba7c267 |
${CallableLib} : ${SharedObjects} ${CallableSharedObjects} ${GlueObjects} ${CallableGlueObjects} ${XXSObjects} $(patsubst %,${SourceDir}/perl/%.xs,${XSModules})
|
|
Jerry James |
ba7c267 |
- ${CXX} ${LDcallableFlags} -o $@ ${SharedObjects} ${CallableSharedObjects} ${GlueObjects} ${CallableGlueObjects} ${XXSObjects} ${XSObjects} ${LDFLAGS} ${PERLccdlflags} -lmpfr -lgmp ${LIBXML2_LIBS} ${LIBS} -L${PERLarchlib}/CORE -lperl
|
|
Jerry James |
ba7c267 |
+ ${CXX} ${LDcallableFlags} -o ${PerlExtDir}/libpolymake.so.@VERSION@ ${SharedObjects} ${CallableSharedObjects} ${GlueObjects} ${CallableGlueObjects} ${XXSObjects} ${XSObjects} ${LDFLAGS} ${PERLccdlflags} -Wl,-h,libpolymake.so.@MAJVER@ -lmpfr -lgmp ${LIBXML2_LIBS} ${LIBS} -L${PERLarchlib}/CORE -lperl
|
|
Jerry James |
ba7c267 |
+ ln -s libpolymake.so.@VERSION@ ${PerlExtDir}/libpolymake.so.@MAJVER@
|
|
Jerry James |
ba7c267 |
+ ln -s libpolymake.so.@MAJVER@ $@
|
|
Jerry James |
ba7c267 |
else
|
|
Jerry James |
ba7c267 |
${CallableLib} : ${GlueObjects} ${XXSObjects} $(patsubst %,${SourceDir}/perl/%.xs,${XSModules})
|
|
Jerry James |
ba7c267 |
endif
|
|
Jerry James |
ba7c267 |
--- ./support/configure.pl.orig 2012-03-02 02:26:14.000000000 -0700
|
|
Jerry James |
ba7c267 |
+++ ./support/configure.pl 2013-02-27 15:10:34.340168780 -0700
|
|
Jerry James |
ba7c267 |
@@ -488,10 +488,6 @@ if (defined $GMP) {
|
|
Jerry James |
ba7c267 |
$CXXflags .= " -I$GMP/include";
|
|
Jerry James |
ba7c267 |
my $libdir=get_libdir($GMP, "gmp");
|
|
Jerry James |
ba7c267 |
$LDflags .= " -L$libdir";
|
|
Jerry James |
ba7c267 |
- if ( !$WithFink && exists $options{gmp}) { # this does not work for Mac OS 10.4
|
|
Jerry James |
ba7c267 |
- # non-standard location
|
|
Jerry James |
ba7c267 |
- $LDflags .= " -Wl,-rpath,$libdir";
|
|
Jerry James |
ba7c267 |
- }
|
|
Jerry James |
ba7c267 |
}
|
|
Jerry James |
ba7c267 |
|
|
Jerry James |
ba7c267 |
my $MPFR=$options{mpfr};
|
|
Jerry James |
ba7c267 |
@@ -500,10 +496,6 @@ if (defined($MPFR) && $MPFR ne $GMP) {
|
|
Jerry James |
ba7c267 |
$CXXflags .= " -I$MPFR/include";
|
|
Jerry James |
ba7c267 |
my $libdir=get_libdir($MPFR, "mpfr");
|
|
Jerry James |
ba7c267 |
$LDflags .= " -L$libdir";
|
|
Jerry James |
ba7c267 |
- if ( !$WithFink ) { # this does not work for Mac OS 10.4
|
|
Jerry James |
ba7c267 |
- # non-standard location
|
|
Jerry James |
ba7c267 |
- $LDflags .= " -Wl,-rpath,$libdir";
|
|
Jerry James |
ba7c267 |
- }
|
|
Jerry James |
ba7c267 |
}
|
|
Jerry James |
ba7c267 |
|
|
Jerry James |
ba7c267 |
my $BOOST=$options{boost};
|