From 74d8a20d1284684f6ca3c91327892e88fdf4a99e Mon Sep 17 00:00:00 2001 From: Jerry James Date: Jan 17 2014 23:20:36 +0000 Subject: Update to latest "perpetual beta" for bug fixes. Enable building new ppl and libnormaliz extensions. --- diff --git a/polymake-fedora.patch b/polymake-fedora.patch index 3b151eb..99bd79f 100644 --- a/polymake-fedora.patch +++ b/polymake-fedora.patch @@ -1,5 +1,5 @@ ---- ./apps/polytope/src/Makefile.inc.orig 2013-08-14 13:17:09.000000000 -0600 -+++ ./apps/polytope/src/Makefile.inc 2013-08-14 14:26:36.000000000 -0600 +--- ./apps/polytope/src/Makefile.inc.orig 2014-01-17 12:40:57.000000000 -0700 ++++ ./apps/polytope/src/Makefile.inc 2014-01-17 14:57:44.958255450 -0700 @@ -1,12 +1,12 @@ ifeq (${ExtensionTop},) StaticLibs := cdd lrs @@ -17,45 +17,28 @@ endif ifneq ($(filter 4.4% 4.5%,${GCCversion}),) ---- ./perl/polymake-config.orig 2013-08-14 13:17:08.000000000 -0600 -+++ ./perl/polymake-config 2013-08-14 14:26:36.000000000 -0600 -@@ -126,9 +126,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"; -@@ -146,8 +143,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)) { ---- ./bundled/group/apps/polytope/src/Makefile.inc.orig 2013-08-14 13:17:11.000000000 -0600 -+++ ./bundled/group/apps/polytope/src/Makefile.inc 2013-08-14 14:26:36.000000000 -0600 -@@ -1,10 +1,10 @@ +--- ./bundled/group/apps/polytope/src/Makefile.inc.orig 2014-01-17 12:40:59.000000000 -0700 ++++ ./bundled/group/apps/polytope/src/Makefile.inc 2014-01-17 14:57:44.958255450 -0700 +@@ -1,14 +1,10 @@ ifeq (${ImportedIntoExtension},) StaticLibs := sympol - sympol_interface$O : ExtraCXXFLAGS += -I${ExtensionTop}/external/sympol - sympol_raycomputation_beneathbeyond$O : ExtraCXXFLAGS += -I${ExtensionTop}/external/sympol +- +- LIBS += ${BuildDir}/staticlib/sympol/libsympol$A ${BuildDir}/../../staticlib/cdd/libcddgmp$A +-endif + sympol_interface$O : ExtraCXXFLAGS += -I/usr/include/sympol + sympol_raycomputation_beneathbeyond$O : ExtraCXXFLAGS += -I/usr/include/sympol -- LIBS += ${BuildDir}/staticlib/sympol/libsympol$A ${BuildDir}/../../staticlib/cdd/libcddgmp$A +-ifneq ($(filter 4.4%,${GCCversion}),) +- universal_polytope_ilps$O : ExtraCXXFLAGS += -O1 + LIBS += -lsympol -lcddgmp endif # Local Variables: ---- ./bundled/group/configure.pl.orig 2013-08-14 13:17:11.000000000 -0600 -+++ ./bundled/group/configure.pl 2013-08-14 14:26:36.000000000 -0600 +--- ./bundled/group/configure.pl.orig 2014-01-17 12:40:59.000000000 -0700 ++++ ./bundled/group/configure.pl 2014-01-17 14:57:44.958255450 -0700 @@ -29,7 +29,7 @@ sub proceed { my ($options)=@_; my $boost_path; @@ -65,8 +48,8 @@ if (defined ($boost_path=$options->{boost})) { $boost_path .= '/include' if (-d "$boost_path/include/boost"); ---- ./bundled/group/staticlib/sympol/Makefile.inc.orig 2013-08-14 13:17:11.000000000 -0600 -+++ ./bundled/group/staticlib/sympol/Makefile.inc 2013-08-14 14:26:36.000000000 -0600 +--- ./bundled/group/staticlib/sympol/Makefile.inc.orig 2014-01-17 12:40:59.000000000 -0700 ++++ ./bundled/group/staticlib/sympol/Makefile.inc 2014-01-17 14:57:44.959255521 -0700 @@ -4,7 +4,7 @@ src := $(ExtensionTop)/external/sympol/s vpath %.cpp $(src) @@ -76,8 +59,75 @@ # Local Variables: # mode: Makefile ---- ./support/configure.pl.orig 2013-08-14 13:17:10.000000000 -0600 -+++ ./support/configure.pl 2013-08-14 14:26:59.000000000 -0600 +--- ./bundled/libnormaliz/apps/polytope/src/Makefile.inc.orig 2014-01-17 12:40:58.000000000 -0700 ++++ ./bundled/libnormaliz/apps/polytope/src/Makefile.inc 2014-01-17 15:29:22.981405715 -0700 +@@ -1,4 +1,5 @@ +- ExtraCXXFLAGS = -I$(ExtensionTop)/external/libnormaliz ++ ExtraCXXFLAGS = -I/usr/include/libnormaliz ++ LIBS += -lnormaliz + + # Local Variables: + # mode: Makefile +--- ./bundled/libnormaliz/apps/polytope/src/normaliz.cc.orig 2014-01-17 12:40:58.000000000 -0700 ++++ ./bundled/libnormaliz/apps/polytope/src/normaliz.cc 2014-01-17 15:55:35.601204574 -0700 +@@ -40,7 +40,7 @@ namespace libnormaliz { + + } + +-#include "libnormaliz-all.cpp" ++#include + + namespace polymake { namespace polytope { + +--- ./perl/polymake-config.orig 2014-01-17 12:40:55.000000000 -0700 ++++ ./perl/polymake-config 2014-01-17 14:57:44.959255521 -0700 +@@ -126,9 +126,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"; +@@ -146,8 +143,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)) { +--- ./staticlib/cdd/Makefile.inc.orig 2014-01-17 12:40:59.000000000 -0700 ++++ ./staticlib/cdd/Makefile.inc 2014-01-17 14:57:44.959255521 -0700 +@@ -1,6 +1,3 @@ +-OwnLibraries := libcdd libcddgmp +-LibModules := cddio cddmp cddlib cddcore cddlp cddproj setoper +- + ExtraCFLAGS := -fvisibility=hidden + + ifeq "$(MAKECMDGOALS)" "libcdd" +@@ -8,8 +5,6 @@ ifeq "$(MAKECMDGOALS)" "libcdd" + else + src := $(ProjectTop)/external/cdd/lib-src-gmp + +- LibModules := $(LibModules) $(patsubst cdd%,cdd%_f,$(LibModules)) +- + $(addsuffix $(LO), $(LibModules)) : $(SourceDir)/globals_gmp.h + + libcddgmp : ExtraCFLAGS += -DGMPRATIONAL $(call addinclude, $(SourceDir)/globals_gmp.h) +--- ./staticlib/lrs/Makefile.inc.orig 2014-01-17 12:40:59.000000000 -0700 ++++ ./staticlib/lrs/Makefile.inc 2014-01-17 14:57:44.960255584 -0700 +@@ -1,5 +1,3 @@ +-OwnLibraries := liblrsgmp +-LibModules := lrslib lrsgmp + src := $(ProjectTop)/external/lrs + vpath %.c $(src) + +--- ./support/configure.pl.orig 2014-01-17 12:40:58.000000000 -0700 ++++ ./support/configure.pl 2014-01-17 14:57:44.960255584 -0700 @@ -372,7 +372,7 @@ if (defined $CC) { print "ok ($CXX is ", defined($GCCversion) ? "GCC $GCCversion" : defined($CLANGversion) ? "CLANG $CLANGversion" : "ICC $ICCversion", ")\n"; @@ -109,29 +159,3 @@ } if ($check_prereq) { ---- ./staticlib/cdd/Makefile.inc.orig 2013-08-14 13:17:11.000000000 -0600 -+++ ./staticlib/cdd/Makefile.inc 2013-08-14 16:09:08.000000000 -0600 -@@ -1,6 +1,3 @@ --OwnLibraries := libcdd libcddgmp --LibModules := cddio cddmp cddlib cddcore cddlp cddproj setoper -- - ExtraCFLAGS := -fvisibility=hidden - - ifeq "$(MAKECMDGOALS)" "libcdd" -@@ -8,8 +5,6 @@ ifeq "$(MAKECMDGOALS)" "libcdd" - else - src := $(ProjectTop)/external/cdd/lib-src-gmp - -- LibModules := $(LibModules) $(patsubst cdd%,cdd%_f,$(LibModules)) -- - $(addsuffix $(LO), $(LibModules)) : $(SourceDir)/globals_gmp.h - - libcddgmp : ExtraCFLAGS += -DGMPRATIONAL $(call addinclude, $(SourceDir)/globals_gmp.h) ---- ./staticlib/lrs/Makefile.inc.orig 2013-08-14 13:17:11.000000000 -0600 -+++ ./staticlib/lrs/Makefile.inc 2013-08-14 16:09:21.000000000 -0600 -@@ -1,5 +1,3 @@ --OwnLibraries := liblrsgmp --LibModules := lrslib lrsgmp - src := $(ProjectTop)/external/lrs - vpath %.c $(src) - diff --git a/polymake.spec b/polymake.spec index e40215f..d755508 100644 --- a/polymake.spec +++ b/polymake.spec @@ -9,11 +9,11 @@ # drivers from subversion and produce a check script. # Date of the "perpetual beta" subversion snapshot -%global svndate 20130813 +%global svndate 20131128 Name: polymake Version: 2.12 -Release: 11.svn%{svndate}%{?dist} +Release: 12.svn%{svndate}%{?dist} Summary: Algorithms on convex polytopes and polyhedra License: GPLv2+ @@ -42,6 +42,7 @@ BuildRequires: bliss-devel BuildRequires: boost-devel BuildRequires: cddlib-devel BuildRequires: cmake +BuildRequires: libnormaliz-devel BuildRequires: libxml2-devel BuildRequires: lrslib-devel BuildRequires: mpfr-devel @@ -50,6 +51,7 @@ BuildRequires: perl(Term::ReadLine::Gnu) BuildRequires: perl(XML::LibXSLT) BuildRequires: perl(XML::SAX::Base) BuildRequires: perl(XML::Writer) +BuildRequires: ppl-devel BuildRequires: sympol-devel BuildRequires: xhtml1-dtds @@ -181,6 +183,8 @@ find %{buildroot}%{polydir} -name \*.so | xargs chmod 0755 # Remove the buildroot from configuration files sed -i 's,%{buildroot},,' %{buildroot}%{polydir}/bundled/bliss/conf.make sed -i 's,%{buildroot},,' %{buildroot}%{polydir}/bundled/group/conf.make +sed -i 's,%{buildroot},,' %{buildroot}%{polydir}/bundled/libnormaliz/conf.make +sed -i 's,%{buildroot},,' %{buildroot}%{polydir}/bundled/ppl/conf.make %post -p /sbin/ldconfig @@ -204,6 +208,10 @@ sed -i 's,%{buildroot},,' %{buildroot}%{polydir}/bundled/group/conf.make %doc doc/* %changelog +* Fri Jan 17 2014 Jerry James - 2.12-12.svn20131128 +- Update to latest "perpetual beta" for bug fixes +- Enable building new ppl and libnormaliz extensions + * Wed Jan 8 2014 Jerry James - 2.12-11.svn20130813 - Rebuild for perl 5.18.2 - Add -format patch to fix -Werror=format-security failure diff --git a/sources b/sources index 96e63bc..487bba5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d7bd05a247d2991aef7a2d4e0ed0cdd0 polymake-2.12.tar.bz2 +8d962326fa88e02641f6b36ab69a81dd polymake-2.12.tar.bz2