From 4327d4635641b9d469a32217a5d46d9a86381ad5 Mon Sep 17 00:00:00 2001 From: Piotr Kubaj Date: Thu, 14 Jan 2021 03:05:49 +0000 Subject: [PATCH] MFH: r561531 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). --- science/rdkit/files/patch-CMakeLists.txt | 14 ++++++++++++-- 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