svn commit: r515815 - in head/science/pcmsolver: . files

[Piotr Kubaj]

Author: pkubaj
Date: Sun Oct 27 19:19:07 2019
New Revision: 515815
URL: https://svnweb.freebsd.org/changeset/ports/515815

Log:
  science/pcmsolver: fix build on GCC architectures
  
  Use C++11 compiler.
  Respect CC and CXX.
  
  Include sys/types.h before including headers to make gid_t, uid_t available.
  
  PR:		241465
  Approved by:	yuri (maintainer), linimon (mentor)

Added:
  head/science/pcmsolver/files/patch-src_bin_run__pcm.cpp   (contents, props changed)
  head/science/pcmsolver/files/patch-src_cavity_GePolCavity.cpp   (contents, props changed)
  head/science/pcmsolver/files/patch-src_green_SphericalDiffuse.cpp   (contents, props changed)
  head/science/pcmsolver/files/patch-src_interface_Input.cpp   (contents, props changed)
  head/science/pcmsolver/files/patch-src_interface_Meddle.cpp   (contents, props changed)
Modified:
  head/science/pcmsolver/Makefile

Modified: head/science/pcmsolver/Makefile
==============================================================================
--- head/science/pcmsolver/Makefile	Sun Oct 27 19:11:51 2019	(r515814)
+++ head/science/pcmsolver/Makefile	Sun Oct 27 19:19:07 2019	(r515815)
@@ -12,9 +12,7 @@ COMMENT=	API for the Polarizable Continuum Model
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN_powerpc64=	fails to compile: SphericalDiffuse.cpp:182: invalid initialization of non-const reference
-
-USES=		cmake:noninja fortran python
+USES=		cmake:noninja compiler:c11 fortran python
 USE_GITHUB=	yes
 GH_ACCOUNT=	PCMSolver
 USE_LDCONFIG=	yes
@@ -27,6 +25,8 @@ do-configure: # full CMAKE_ARGS breaks configure: -DCM
 			-DCMAKE_C_FLAGS_RELEASE:STRING="${CFLAGS}" \
 			-DCMAKE_CXX_FLAGS_RELEASE:STRING="${CXXFLAGS}" \
 			-DCMAKE_EXE_LINKER_FLAGS:STRING="${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so" \
+			-DCMAKE_C_COMPILER:STRING="${CC}" \
+			-DCMAKE_CXX_COMPILER:STRING="${CXX}" \
 			${CMAKE_SOURCE_PATH}
 
 post-patch:

Added: head/science/pcmsolver/files/patch-src_bin_run__pcm.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/pcmsolver/files/patch-src_bin_run__pcm.cpp	Sun Oct 27 19:19:07 2019	(r515815)
@@ -0,0 +1,10 @@
+--- src/bin/run_pcm.cpp.orig	2019-10-24 12:38:26 UTC
++++ src/bin/run_pcm.cpp
+@@ -31,6 +31,7 @@
+ #include <utility>
+ #include <vector>
+ 
++#include <sys/types.h>
+ #include "Config.hpp"
+ 
+ #include <Eigen/Core>

Added: head/science/pcmsolver/files/patch-src_cavity_GePolCavity.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/pcmsolver/files/patch-src_cavity_GePolCavity.cpp	Sun Oct 27 19:19:07 2019	(r515815)
@@ -0,0 +1,18 @@
+--- src/cavity/GePolCavity.cpp.orig	2019-10-24 12:25:02 UTC
++++ src/cavity/GePolCavity.cpp
+@@ -21,6 +21,7 @@
+  * PCMSolver API, see: <http://pcmsolver.readthedocs.io/>
+  */
+ 
++#include <sys/types.h>
+ #include "GePolCavity.hpp"
+ 
+ #include <algorithm>
+@@ -32,7 +33,6 @@
+ #include <string>
+ #include <vector>
+ 
+-#include <sys/types.h>
+ #include <unistd.h>
+ 
+ #include "Config.hpp"

Added: head/science/pcmsolver/files/patch-src_green_SphericalDiffuse.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/pcmsolver/files/patch-src_green_SphericalDiffuse.cpp	Sun Oct 27 19:19:07 2019	(r515815)
@@ -0,0 +1,10 @@
+--- src/green/SphericalDiffuse.cpp.orig	2019-10-24 12:30:56 UTC
++++ src/green/SphericalDiffuse.cpp
+@@ -21,6 +21,7 @@
+  * PCMSolver API, see: <http://pcmsolver.readthedocs.io/>
+  */
+ 
++#include <sys/types.h>
+ #include "SphericalDiffuse.hpp"
+ 
+ #include <iosfwd>

Added: head/science/pcmsolver/files/patch-src_interface_Input.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/pcmsolver/files/patch-src_interface_Input.cpp	Sun Oct 27 19:19:07 2019	(r515815)
@@ -0,0 +1,10 @@
+--- src/interface/Input.cpp.orig	2019-10-24 12:34:49 UTC
++++ src/interface/Input.cpp
+@@ -21,6 +21,7 @@
+  * PCMSolver API, see: <http://pcmsolver.readthedocs.io/>
+  */
+ 
++#include <sys/types.h>
+ #include "Input.hpp"
+ 
+ #include <algorithm>

Added: head/science/pcmsolver/files/patch-src_interface_Meddle.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/pcmsolver/files/patch-src_interface_Meddle.cpp	Sun Oct 27 19:19:07 2019	(r515815)
@@ -0,0 +1,10 @@
+--- src/interface/Meddle.cpp.orig	2019-10-24 12:36:20 UTC
++++ src/interface/Meddle.cpp
+@@ -21,6 +21,7 @@
+  * PCMSolver API, see: <http://pcmsolver.readthedocs.io/>
+  */
+ 
++#include <sys/types.h>
+ #include "Meddle.hpp"
+ #include "PCMInput.h"
+ #include "pcmsolver.h"