git: e57fccae01e0 - main - science/rdkit: fix build on armv7
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 01 Jan 2025 12:25:15 UTC
The branch main has been updated by fuz:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e57fccae01e00fc6935f27175a4be44bdc141048
commit e57fccae01e00fc6935f27175a4be44bdc141048
Author: Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2024-12-29 21:33:24 +0000
Commit: Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2025-01-01 12:24:55 +0000
science/rdkit: fix build on armv7
Only attempt to use -mpopcnt on architectures known to support it
Approved by: portmgr (build fix blanket)
Event: 38C3
---
science/rdkit/files/patch-CMakeLists.txt | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/science/rdkit/files/patch-CMakeLists.txt b/science/rdkit/files/patch-CMakeLists.txt
index a4594f30ae57..ae2118c6df4d 100644
--- a/science/rdkit/files/patch-CMakeLists.txt
+++ b/science/rdkit/files/patch-CMakeLists.txt
@@ -1,6 +1,23 @@
---- CMakeLists.txt.orig 2020-06-10 03:59:48 UTC
+--- CMakeLists.txt.orig 2024-12-20 08:56:08 UTC
+++ CMakeLists.txt
-@@ -432,12 +432,14 @@ if(NOT RDK_INSTALL_INTREE)
+@@ -76,12 +76,12 @@ if(NOT MSVC)
+
+ if(NOT MSVC)
+ if(RDK_OPTIMIZE_POPCNT)
+- if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64)")
+- message("RDK_OPTIMIZE_POPCNT is not available on aarch64 or arm64")
+- elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(ppc64|powerpc64)")
++ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(ppc64|powerpc64)")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mpopcntd")
+- else()
++ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i386|amd64|x86_64)")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mpopcnt")
++ else()
++ message("RDK_OPTIMIZE_POPCNT is not available on your architecture")
+ endif()
+ endif()
+ endif()
+@@ -516,12 +516,14 @@ if(NOT RDK_INSTALL_INTREE)
COMPONENT data
PATTERN ".svn" EXCLUDE
)