mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-30 01:15:52 +00:00
Code Issues Releases Activity

science/rdkit: Add PGSQL option to build the PostgreSQL cartridge

Browse Source 
Also fix build with DOCS=OFF
This commit is contained in:
Yuri Victorovich 2021-03-08 17:29:24 +00:00
parent 5b8ca689ef
commit b25fd71db7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=567856
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
science/rdkit/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= rdkit PORTNAME= rdkit
DISTVERSIONPREFIX= Release_ DISTVERSIONPREFIX= Release_
DISTVERSION= 2020_09_5 DISTVERSION= 2020_09_5
PORTREVISION= 1
CATEGORIES= science CATEGORIES= science
MAINTAINER= yuri@FreeBSD.org MAINTAINER= yuri@FreeBSD.org
@ -28,17 +29,24 @@ CMAKE_OFF= RDK_INSTALL_INTREE RDK_USE_FLEXBISON \
RDK_INSTALL_STATIC_LIBS RDK_SWIG_STATIC RDK_PGSQL_STATIC \ RDK_INSTALL_STATIC_LIBS RDK_SWIG_STATIC RDK_PGSQL_STATIC \
RDK_OPTIMIZE_NATIVE \ RDK_OPTIMIZE_NATIVE \
RDK_BUILD_CPP_TESTS RDK_BUILD_CPP_TESTS
CMAKE_ARGS= -DFREEBSD_DOCSDIR:PATH=${DOCSDIR} -DCATCH_DIR=${LOCALBASE}/include/catch2 CMAKE_ARGS= -DCATCH_DIR=${LOCALBASE}/include/catch2
DATADIR= ${PREFIX}/share/RDKit DATADIR= ${PREFIX}/share/RDKit
DOCSDIR= ${PREFIX}/share/doc/RDKit DOCSDIR= ${PREFIX}/share/doc/RDKit
PLIST_SUB= SHLIB_VER=${PORTVERSION} PLIST_SUB= SHLIB_VER=${PORTVERSION}
OPTIONS_DEFINE= PYTHON DOCS OPTIONS_DEFINE= DOCS PGSQL PYTHON
OPTIONS_DEFAULT= PYTHON OPTIONS_DEFAULT= PYTHON
OPTIONS_SUB= yes OPTIONS_SUB= yes
DOCS_CMAKE_BOOL= FREEBSD_INSTALL_DOCS
DOCS_CMAKE_ON= -DFREEBSD_DOCSDIR:PATH=${DOCSDIR}
PGSQL_USES= pgsql
PGSQL_DESC= Build the PostgreSQL cartridge
PGSQL_CMAKE_BOOL= RDK_BUILD_PGSQL
PYTHON_CMAKE_BOOL= RDK_BUILD_PYTHON_WRAPPERS PYTHON_CMAKE_BOOL= RDK_BUILD_PYTHON_WRAPPERS
PYTHON_BUILD_DEPENDS= ${PYNUMPY} PYTHON_BUILD_DEPENDS= ${PYNUMPY}
PYTHON_LIB_DEPENDS= ${PY_BOOST} PYTHON_LIB_DEPENDS= ${PY_BOOST}

16
science/rdkit/files/patch-CMakeLists.txt
View File

@ -1,21 +1,29 @@
--- CMakeLists.txt.orig 2020-12-12 08:00:55 UTC --- CMakeLists.txt.orig 2021-03-01 16:43:06 UTC
+++ CMakeLists.txt +++ CMakeLists.txt
@@ -68,7 +68,7 @@ if(NOT MSVC) @@ -68,8 +68,8 @@ if(NOT MSVC)
if(RDK_OPTIMIZE_POPCNT) if(RDK_OPTIMIZE_POPCNT)
if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64") if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64")
message("RDK_OPTIMIZE_POPCNT is not available on aarch64") message("RDK_OPTIMIZE_POPCNT is not available on aarch64")
- elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "ppc64le") - elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "ppc64le")
+ elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(ppc64|powerpc64)")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mpopcntb") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mpopcntb")
+ elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(ppc64|powerpc64)")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mpopcntd") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mpopcntd")
else() else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mpopcnt") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mpopcnt")
@@ -460,7 +460,7 @@ if(NOT RDK_INSTALL_INTREE) endif()
@@ -459,12 +459,14 @@ if(NOT RDK_INSTALL_INTREE)
COMPONENT data
PATTERN ".svn" EXCLUDE PATTERN ".svn" EXCLUDE
) )
+ if (FREEBSD_INSTALL_DOCS)
install(DIRECTORY Docs DESTINATION install(DIRECTORY Docs DESTINATION
- ${RDKit_ShareDir} - ${RDKit_ShareDir}
+ ${FREEBSD_DOCSDIR} + ${FREEBSD_DOCSDIR}
COMPONENT docs COMPONENT docs
PATTERN ".svn" EXCLUDE PATTERN ".svn" EXCLUDE
PATTERN "_build" EXCLUDE PATTERN "_build" EXCLUDE
)
+ endif()
install(DIRECTORY Contrib DESTINATION
${RDKit_ShareDir}
COMPONENT extras