svn commit: r493819 - in head/math/gfan: . files

[Mark Linimon]

Author: linimon
Date: Sun Feb 24 22:10:43 2019
New Revision: 493819
URL: https://svnweb.freebsd.org/changeset/ports/493819

Log:
  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

Modified:
  head/math/gfan/Makefile
  head/math/gfan/files/patch-Makefile

Modified: head/math/gfan/Makefile
==============================================================================
--- head/math/gfan/Makefile	Sun Feb 24 22:06:09 2019	(r493818)
+++ head/math/gfan/Makefile	Sun Feb 24 22:10:43 2019	(r493819)
@@ -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
 

Modified: head/math/gfan/files/patch-Makefile
==============================================================================
--- head/math/gfan/files/patch-Makefile	Sun Feb 24 22:06:09 2019	(r493818)
+++ head/math/gfan/files/patch-Makefile	Sun Feb 24 22:10:43 2019	(r493819)
@@ -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)/*