Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 20 Dec 2024 12:05:28 GMT
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 6970d6fe212a - main - science/rdkit: correct pkg-plist on big-endian, correct ARCH check, enable on i386
Message-ID:  <202412201205.4BKC5SmH015370@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6970d6fe212a79715ec754cb753659db83619b2d

commit 6970d6fe212a79715ec754cb753659db83619b2d
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2024-12-19 12:15:23 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2024-12-20 12:04:59 +0000

    science/rdkit: correct pkg-plist on big-endian, correct ARCH check, enable on i386
    
    1. powerpc64le is also little-endian.
    2. There are now less big-endian architectures than little-endian, so revert
    the check, now also covering powerpc64le.
    3. Tested on i386, works fine on 14.2-RELEASE.
---
 science/rdkit/Makefile  | 9 ++++-----
 science/rdkit/pkg-plist | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/science/rdkit/Makefile b/science/rdkit/Makefile
index b70e9f81c9b2..c44922819a01 100644
--- a/science/rdkit/Makefile
+++ b/science/rdkit/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	rdkit
 DISTVERSIONPREFIX=	Release_
 DISTVERSION=	2024_03_6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	LOCAL/yuri/:font # unstable, changing font file: https://fonts.google.com/download?family=Comic%20Neue&dummy=/:font
 DISTFILES=	ComicNeue-Regular.ttf:font
@@ -15,7 +15,6 @@ WWW=		https://www.rdkit.org/
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/license.txt
 
-BROKEN_i386=	non-constant-expression cannot be narrowed from type 'unsigned int' to 'npy_intp', see https://github.com/rdkit/rdkit/issues/4934
 BROKEN_FreeBSD_15_aarch64=	clang-17 crashes, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=272652
 BROKEN_FreeBSD_15_amd64=	clang-17 crashes, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=272652
 
@@ -75,10 +74,10 @@ PORTDOCS=	*
 
 .include <bsd.port.options.mk>
 
-.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH:Marm*} || ${ARCH} == i386 || ${ARCH:Mmips*el*} || ${ARCH} == riscv
-PLIST_SUB+=	LITTLE_ENDIAN=""
-.else
+.if ${ARCH} == powerpc || ${ARCH} == powerpc64
 PLIST_SUB+=	LITTLE_ENDIAN="@comment "
+.else
+PLIST_SUB+=	LITTLE_ENDIAN=""
 .endif
 
 post-extract:
diff --git a/science/rdkit/pkg-plist b/science/rdkit/pkg-plist
index eabbfffc1000..4fb73662f59c 100644
--- a/science/rdkit/pkg-plist
+++ b/science/rdkit/pkg-plist
@@ -720,7 +720,7 @@ lib/libRDKitga.so.1.%%SHLIB_VER%%
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rdkit/ML/Cluster/Butina.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rdkit/ML/Cluster/ClusterUtils.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rdkit/ML/Cluster/ClusterVis.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/rdkit/ML/Cluster/Clustering.so
+%%LITTLE_ENDIAN%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/rdkit/ML/Cluster/Clustering.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rdkit/ML/Cluster/Clusters.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rdkit/ML/Cluster/Murtagh.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rdkit/ML/Cluster/Resemblance.py



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412201205.4BKC5SmH015370>