diff options
| author |   Thomas Kahle <tomka@gentoo.org> | 2012-11-12 03:15:19 +0000 |
|---|---|---|
| committer | Thomas Kahle <tomka@gentoo.org> | 2012-11-12 03:15:19 +0000 |
| commit | fac6852b80d6cdc08e06bc2828e4381525bd1904 (patch) | |
| tree | c8f4f3af58f5bb49afc250e77d6b9d24a8164e0f /sci-mathematics/normaliz/files | |
| parent | Proper static libs removal (diff) | |
| download | gentoo-2-fac6852b80d6cdc08e06bc2828e4381525bd1904.tar.gz gentoo-2-fac6852b80d6cdc08e06bc2828e4381525bd1904.tar.bz2 gentoo-2-fac6852b80d6cdc08e06bc2828e4381525bd1904.zip | |
Bump to 2.8
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0x89DEB219565C32BC)
Diffstat (limited to 'sci-mathematics/normaliz/files')
| -rw-r--r-- | sci-mathematics/normaliz/files/normaliz-2.8-respect-flags.patch | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/sci-mathematics/normaliz/files/normaliz-2.8-respect-flags.patch b/sci-mathematics/normaliz/files/normaliz-2.8-respect-flags.patch new file mode 100644 index 000000000000..ebde3a0a35ec --- /dev/null +++ b/sci-mathematics/normaliz/files/normaliz-2.8-respect-flags.patch @@ -0,0 +1,67 @@ +diff -U 3 -dHrN Normaliz2.8.orig/source/libnormaliz/Makefile Normaliz2.8/source/libnormaliz/Makefile +--- Normaliz2.8.orig/source/libnormaliz/Makefile 2012-11-11 19:05:18.610268519 -0800 ++++ Normaliz2.8/source/libnormaliz/Makefile 2012-11-11 19:07:17.040437439 -0800 +@@ -11,16 +11,16 @@ + all: default + + libnormaliz.o: $(LIBHEADERS) $(LIBSOURCES) libnormaliz-impl.cpp +- $(CXX) $(CXXFLAGS) $(NORMFLAGS) -c libnormaliz-impl.cpp -o libnormaliz.o ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(NORMFLAGS) -c libnormaliz-impl.cpp -o libnormaliz.o + + cone_property.o: cone_property.h cone_property.cpp +- $(CXX) $(CXXFLAGS) $(NORMFLAGS) -c cone_property.cpp -o $@ ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(NORMFLAGS) -c cone_property.cpp -o $@ + + hilbert_series.o: $(LIBHEADERS) HilbertSeries.cpp +- $(CXX) $(CXXFLAGS) $(NORMFLAGS) -c HilbertSeries.cpp -o $@ ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(NORMFLAGS) -c HilbertSeries.cpp -o $@ + + libnormaliz-templated.o: $(LIBHEADERS) $(LIBSOURCES) libnormaliz-templated.cpp +- $(CXX) $(CXXFLAGS) $(NORMFLAGS) -c libnormaliz-templated.cpp -o $@ ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(NORMFLAGS) -c libnormaliz-templated.cpp -o $@ + + libnormaliz.a: cone_property.o hilbert_series.o libnormaliz-templated.o + ar -cr $@ $^ +diff -U 3 -dHrN Normaliz2.8.orig/source/Makefile Normaliz2.8/source/Makefile +--- Normaliz2.8.orig/source/Makefile 2012-11-11 19:05:18.610268519 -0800 ++++ Normaliz2.8/source/Makefile 2012-11-11 19:06:14.265817851 -0800 +@@ -17,13 +17,13 @@ + $(MAKE) normaliz + + normaliz: $(SOURCES) $(HEADERS) libnormaliz/libnormaliz.a +- $(CXX) $(CXXFLAGS) $(NORMFLAGS) Normaliz.cpp libnormaliz/libnormaliz.a $(GMPFLAGS) -o normaliz ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(NORMFLAGS) Normaliz.cpp libnormaliz/libnormaliz.a $(GMPFLAGS) -o normaliz + + normaliz1: $(SOURCES) $(HEADERS) $(LIBHEADERS) $(LIBSOURCES) +- $(CXX) $(CXXFLAGS) $(NORMFLAGS) Normaliz-impl.cpp $(GMPFLAGS) -o normaliz1 ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(NORMFLAGS) Normaliz-impl.cpp $(GMPFLAGS) -o normaliz1 + + normaliz-pg: $(SOURCES) $(HEADERS) $(LIBHEADERS) $(LIBSOURCES) +- $(CXX) $(CXXFLAGS) $(NORMFLAGS) -pg Normaliz-impl.cpp $(GMPFLAGS) -o normaliz-pg ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(NORMFLAGS) -pg Normaliz-impl.cpp $(GMPFLAGS) -o normaliz-pg + + + #always go down the directory and let the make there check what has to be done +diff -U 3 -dHrN Normaliz2.8.orig/source/Makefile.configuration Normaliz2.8/source/Makefile.configuration +--- Normaliz2.8.orig/source/Makefile.configuration 2012-11-11 19:05:18.613268547 -0800 ++++ Normaliz2.8/source/Makefile.configuration 2012-11-11 19:05:37.323453221 -0800 +@@ -1,11 +1,9 @@ + ## + ## Makefile configuration for normaliz + ## +-CXX = g++ + #CXX = linux32 g++ -m32 -march=i686 #compile it for linux32 + CXXFLAGS += -Wall + CXXFLAGS += -pedantic -Wno-long-long +-CXXFLAGS += -O3 -funroll-loops + #CXXFLAGS += -I /usr/local/boost_1_45_0 + #CXXFLAGS += -g + #CXXFLAGS += -pg +@@ -19,7 +17,6 @@ + endif + + ##for mac link libgcc not static +-NORMFLAGS = -static + #NORMFLAGS = -static-libgcc + + GMPFLAGS = -lgmpxx -lgmp |