svn commit: r561531 - in head/science/rdkit: . files

[Piotr Kubaj]

Author: pkubaj
Date: Thu Jan 14 03:04:49 2021
New Revision: 561531
URL: https://svnweb.freebsd.org/changeset/ports/561531

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

Modified:
  head/science/rdkit/files/patch-CMakeLists.txt
  head/science/rdkit/pkg-plist

Modified: head/science/rdkit/files/patch-CMakeLists.txt
==============================================================================
--- head/science/rdkit/files/patch-CMakeLists.txt	Thu Jan 14 03:01:31 2021	(r561530)
+++ head/science/rdkit/files/patch-CMakeLists.txt	Thu Jan 14 03:04:49 2021	(r561531)
@@ -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

Modified: head/science/rdkit/pkg-plist
==============================================================================
--- head/science/rdkit/pkg-plist	Thu Jan 14 03:01:31 2021	(r561530)
+++ head/science/rdkit/pkg-plist	Thu Jan 14 03:04:49 2021	(r561531)
@@ -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