diff options
| author | Piotr Kubaj <pkubaj@FreeBSD.org> | 2021-01-14 11:04:49 +0800 |
|---|---|---|
| committer | Piotr Kubaj <pkubaj@FreeBSD.org> | 2021-01-14 11:04:49 +0800 |
| commit | 0a27c5adbc3b5a9c53065c95d0329c3c9705125d (patch) | |
| tree | 8c36f62e72cb8e7dca42d9a88633e651182f63e4 /science | |
| parent | d908e7eb2cb9ac8cda55a92c9f9d7efecea9c2cb (diff) | |
| download | freebsd-ports-gnome-0a27c5adbc3b5a9c53065c95d0329c3c9705125d.tar.gz freebsd-ports-gnome-0a27c5adbc3b5a9c53065c95d0329c3c9705125d.tar.zst freebsd-ports-gnome-0a27c5adbc3b5a9c53065c95d0329c3c9705125d.zip | |
science/rdkit: fix packaging on powerpc64
Also switch not-working with Clang -mpopcntb with -mpopcntd (as a side effect it also raises requirements from POWER5 to POWER7).
MFH: 2021Q1
Diffstat (limited to 'science')
| -rw-r--r-- | science/rdkit/files/patch-CMakeLists.txt | 14 | ||||
| -rw-r--r-- | science/rdkit/pkg-plist | 8 |
2 files changed, 16 insertions, 6 deletions
diff --git a/science/rdkit/files/patch-CMakeLists.txt b/science/rdkit/files/patch-CMakeLists.txt index 8a8804edd64f..463715d81d42 100644 --- a/science/rdkit/files/patch-CMakeLists.txt +++ b/science/rdkit/files/patch-CMakeLists.txt @@ -1,6 +1,16 @@ ---- CMakeLists.txt.orig 2018-10-22 02:29:34 UTC +--- CMakeLists.txt.orig 2020-12-12 08:00:55 UTC +++ CMakeLists.txt -@@ -410,7 +410,7 @@ if(NOT RDK_INSTALL_INTREE) +@@ -68,7 +68,7 @@ if(NOT MSVC) + if(RDK_OPTIMIZE_POPCNT) + if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64") + message("RDK_OPTIMIZE_POPCNT is not available on aarch64") +- 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} -mpopcntd") + else() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mpopcnt") +@@ -460,7 +460,7 @@ if(NOT RDK_INSTALL_INTREE) PATTERN ".svn" EXCLUDE ) install(DIRECTORY Docs DESTINATION diff --git a/science/rdkit/pkg-plist b/science/rdkit/pkg-plist index ae7722f4a539..bfab6a8f37f5 100644 --- a/science/rdkit/pkg-plist +++ b/science/rdkit/pkg-plist @@ -314,10 +314,10 @@ include/rdkit/RDGeneral/utils.h include/rdkit/RDGeneral/versions.h include/rdkit/RDStreams/streams.h include/rdkit/RingDecomposerLib.h -include/rdkit/SimDivPickers/DistPicker.h -include/rdkit/SimDivPickers/HierarchicalClusterPicker.h -include/rdkit/SimDivPickers/LeaderPicker.h -include/rdkit/SimDivPickers/MaxMinPicker.h +%%LITTLE_ENDIAN%%include/rdkit/SimDivPickers/DistPicker.h +%%LITTLE_ENDIAN%%include/rdkit/SimDivPickers/HierarchicalClusterPicker.h +%%LITTLE_ENDIAN%%include/rdkit/SimDivPickers/LeaderPicker.h +%%LITTLE_ENDIAN%%include/rdkit/SimDivPickers/MaxMinPicker.h lib/cmake/rdkit/rdkit-config-version.cmake lib/cmake/rdkit/rdkit-config.cmake lib/cmake/rdkit/rdkit-targets-%%CMAKE_BUILD_TYPE%%.cmake |