From a16e1074215ced61520242e28cceb21653f3ad55 Mon Sep 17 00:00:00 2001 From: Mark Linimon Date: Sun, 24 Feb 2019 22:10:43 +0000 Subject: This port requires a C++11-compatible compiler to build, so add USES=compiler:c++11-lang to fix build on GCC-based architectures. Also add LDFLAGS to the linking command so that it links against ports libstdc++. While here, add USES=localbase. PR: 235976 Submitted by: Piotr Kubaj Approved by: maintainer --- math/gfan/Makefile | 4 ++-- math/gfan/files/patch-Makefile | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'math/gfan') diff --git a/math/gfan/Makefile b/math/gfan/Makefile index a56106f32e55..aedb479ec893 100644 --- a/math/gfan/Makefile +++ b/math/gfan/Makefile @@ -16,9 +16,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcddgmp.so:math/cddlib \ libgmp.so:math/gmp -USES= gmake +USES= compiler:c++11-lang gmake localbase -CFLAGS+= -I${LOCALBASE}/include -DGMPRATIONAL +CFLAGS+= -DGMPRATIONAL OPTIONS_DEFINE= DOCS EXAMPLES diff --git a/math/gfan/files/patch-Makefile b/math/gfan/files/patch-Makefile index 386e4a353358..25c60feeb2e8 100644 --- a/math/gfan/files/patch-Makefile +++ b/math/gfan/files/patch-Makefile @@ -17,7 +17,7 @@ #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 +@@ -125,9 +125,9 @@ OPTFLAGS = -DGMPRATIONAL -Wuninitialized -fno-omit #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 @@ -38,3 +38,12 @@ # If compiling with clang, use the line below instead: # $(CXX) $(CFLAGS) -c src/symmetrictraversal.cpp -o src/symmetrictraversal.o +@@ -420,7 +420,7 @@ default: $(OBJECTS) $(ADDITIONALOBJECTS) $(EXECS) + + $(MAIN): $(OBJECTS) + # $(CCLINKER) $(OBJECTS) $(ADDITIONALLINKOPTIONS) $(GPROFFLAG) -lpthread -o $(MAIN) +- $(CCLINKER) $(OBJECTS) $(ADDITIONALLINKOPTIONS) $(GPROFFLAG) -lpthread -rdynamic -o $(MAIN) ++ $(CCLINKER) $(OBJECTS) $(LDFLAGS) $(ADDITIONALLINKOPTIONS) $(GPROFFLAG) -lpthread -rdynamic -o $(MAIN) + + release: + rm -f -r $(RELEASEDIR)/* -- cgit v1.2.3