diff options
Diffstat (limited to 'math/gfan/files')
| -rw-r--r-- | math/gfan/files/patch-Makefile | 40 | ||||
| -rw-r--r-- | math/gfan/files/patch-testsuite_0008PolynomialSetUnion_output | 94 |
2 files changed, 134 insertions, 0 deletions
diff --git a/math/gfan/files/patch-Makefile b/math/gfan/files/patch-Makefile new file mode 100644 index 000000000000..386e4a353358 --- /dev/null +++ b/math/gfan/files/patch-Makefile @@ -0,0 +1,40 @@ +--- Makefile.orig 2017-09-28 13:44:12 UTC ++++ Makefile +@@ -110,13 +110,13 @@ MKDIR=mkdir -p + PREFIX = + SHELL = /bin/sh + #ARCH = LINUX +-CC = $(PREFIX)gcc ++CC ?= $(PREFIX)gcc + CLINKER = $(CC) +-CXX = $(PREFIX)g++ ++CXX ?= $(PREFIX)g++ + CCLINKER = $(CXX) + #OPTFLAGS = -O2 -DGMPRATIONAL -DNDEBUG + # Note that gcc produces wrong code with -O3 +-OPTFLAGS = -DGMPRATIONAL -Wuninitialized -fno-omit-frame-pointer -O2 #-O3 -fno-guess-branch-probability #-DNDEBUG ++#OPTFLAGS = -DGMPRATIONAL -Wuninitialized -fno-omit-frame-pointer -O2 #-O3 -fno-guess-branch-probability #-DNDEBUG + #OPTFLAGS = -DGMPRATIONAL -Wuninitialized -fno-omit-frame-pointer -O3 -mavx -msse2 -finline-limit=1000 -ffast-math -Wuninitialized # -fno-guess-branch-probability #-DNDEBUG -ftree-vectorizer-verbose=2 + #OPTFLAGS = -DGMPRATIONAL -Wuninitialized -fno-omit-frame-pointer -O1 -fno-guess-branch-probability + #-DNDEBUG +@@ -125,9 +125,9 @@ OPTFLAGS = -DGMPRATIONAL -Wuninitial + #OPTFLAGS = -DGMPRATIONAL -Wuninitialized -fno-omit-frame-pointer -O3 -msse2 -ftree-vectorizer-verbose=2 -ffast-math #-DNDEBUG + #OPTFLAGS = -DGMPRATIONAL -Wuninitialized -fno-omit-frame-pointer -O3 -mavx -msse2 -ftree-vectorizer-verbose=2 -ffast-math #-DNDEBUG + +-CFLAGS = $(OPTFLAGS) $(GPROFFLAG) $(STACTDUMP_OPTIONS) $(ADDITIONALINCLUDEOPTIONS) -std=c++0x -g $(CDDDEFINE_PREFIX) #-pedantic ++CFLAGS += $(OPTFLAGS) $(GPROFFLAG) $(STACTDUMP_OPTIONS) $(ADDITIONALINCLUDEOPTIONS) -std=c++0x -g $(CDDDEFINE_PREFIX) #-pedantic + #CFLAGS = $(OPTFLAGS) $(GPROFFLAG) $(STACTDUMP_OPTIONS) $(ADDITIONALINCLUDEOPTIONS) -D_GLIBCXX_DEBUG -std=c++0x -g $(CDDDEFINE_PREFIX) #-pedantic +-CCFLAGS = $(CFLAGS) ++CCFLAGS += $(CFLAGS) + FFLAGS = $(OPTFLAGS) + + CATSOBJECTS = lp_cdd.o \ +@@ -394,7 +394,7 @@ EXECS = $(MAIN) + # (compiling with gcc version 4.7.2 and running gfan _tropicaltraverse on a starting cone for Grassmann3_7) + # Either this is a bug in the code or in the compiler. The bug disappears by compiling with -fno-guess-branch-probability + src/symmetrictraversal.o: src/symmetrictraversal.cpp +- $(CXX) $(CFLAGS) -fno-guess-branch-probability -c src/symmetrictraversal.cpp -o src/symmetrictraversal.o ++ $(CXX) $(CFLAGS) -c src/symmetrictraversal.cpp -o src/symmetrictraversal.o + # If compiling with clang, use the line below instead: + # $(CXX) $(CFLAGS) -c src/symmetrictraversal.cpp -o src/symmetrictraversal.o + diff --git a/math/gfan/files/patch-testsuite_0008PolynomialSetUnion_output b/math/gfan/files/patch-testsuite_0008PolynomialSetUnion_output new file mode 100644 index 000000000000..32067e9162a4 --- /dev/null +++ b/math/gfan/files/patch-testsuite_0008PolynomialSetUnion_output @@ -0,0 +1,94 @@ +--- testsuite/0008PolynomialSetUnion/output.orig 2013-09-23 12:03:23 UTC ++++ testsuite/0008PolynomialSetUnion/output +@@ -1,62 +1,62 @@ +-{ ++Q[a,b,c] ++a*b-c^6, ++a*b^2-c^3, ++a*b^4-b, ++a*c-b^6, ++a*c^2-b, ++a*c^6-c, ++a-b^11, ++a-b^2*c, ++a-c^9, + a^11-c, + a^15-a, ++a^2*b-c, + a^2*b^3-a, ++a^2*c-b^3, + a^2-b^8, +-a^2*b-c, + a^2-c^4, +-a^2*c-b^3, +-a^3-b^5, +-a^3-b*c^2, + a^3*c^2-c} +-a^4-b^2, ++a^3-b*c^2, ++a^3-b^5, + a^4*c-a, ++a^4-b^2, + a^5-c^3, + a^6*b-a, + a^6-b*c, + a^8-c^2, + a^9-b, +-a-b^11, +-a-b^2*c, +-a*b^2-c^3, +-a*b^4-b, +-a*b-c^6, +-a*c^2-b, +-a*c^6-c, +-a-c^9, +-a*c-b^6, ++b*c-a^6, ++b*c^2-a^3, ++b*c^4-c, ++b-a*c^2, ++b-a^9, ++b-c^11, + b^11-a, + b^15-b, +-b^2-a^4, ++b^2*c-a, + b^2*c^3-b, ++b^2-a^4, + b^2-c^8, +-b^2*c-a, + b^3-a^2*c, + b^3-c^5, + b^4-c^2, + b^5-a^3, +-b^6-a*c, + b^6*c-b, ++b^6-a*c, + b^8-a^2, + b^9-c, +-b-a^9, +-b-a*c^2, +-b-c^11, +-b*c^2-a^3, +-b*c^4-c, +-b*c-a^6, ++c-a^11, ++c-a^2*b, ++c-b^9, + c^11-b, + c^15-c, + c^2-a^8, + c^2-b^4, +-c^3-a^5, + c^3-a*b^2, ++c^3-a^5, + c^4-a^2, + c^5-b^3, + c^6-a*b, + c^8-b^2, + c^9-a, +-c-a^11, +-c-a^2*b, +-c-b^9, +-Q[a,b,c] ++{ |