From owner-svn-ports-all@freebsd.org Tue Aug 20 00:08:48 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E817ED5D89; Tue, 20 Aug 2019 00:08:48 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46CB3N5pxkz4c41; Tue, 20 Aug 2019 00:08:48 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AAC402290D; Tue, 20 Aug 2019 00:08:48 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7K08m7N031328; Tue, 20 Aug 2019 00:08:48 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7K08mwD031326; Tue, 20 Aug 2019 00:08:48 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <201908200008.x7K08mwD031326@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Tue, 20 Aug 2019 00:08:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r509389 - head/science/rdkit X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/science/rdkit X-SVN-Commit-Revision: 509389 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Aug 2019 00:08:49 -0000 Author: pkubaj Date: Tue Aug 20 00:08:48 2019 New Revision: 509389 URL: https://svnweb.freebsd.org/changeset/ports/509389 Log: science/rdkit: fix build on GCC architectures This port needs new GCC to build. It adds -mpopcnt to *FLAGS, which breaks build on non-x86. Since it optimizes for the host CPU, don't enable it. Some libraries are not installed on big-endian systems. PR: 239299 Approved by: yuri (maintainer), mat (mentor) Differential Revision: https://reviews.freebsd.org/D20997 Modified: head/science/rdkit/Makefile head/science/rdkit/pkg-plist Modified: head/science/rdkit/Makefile ============================================================================== --- head/science/rdkit/Makefile Tue Aug 20 00:08:46 2019 (r509388) +++ head/science/rdkit/Makefile Tue Aug 20 00:08:48 2019 (r509389) @@ -17,14 +17,15 @@ BUILD_DEPENDS= catch>0:devel/catch \ rapidjson>=0:devel/rapidjson LIB_DEPENDS= libboost_system.so:devel/boost-libs -USES= bison:build cmake eigen:3 python +USES= bison:build cmake compiler:c++11-lang eigen:3 python USE_GITHUB= yes GH_TUPLE= schrodinger:maeparser:1.0.0:maeparser/External/CoordGen/maeparser \ schrodinger:coordgenlibs:ede3191:coordgenlibs/External/CoordGen/coordgenlibs USE_LDCONFIG= yes CMAKE_OFF= RDK_INSTALL_INTREE RDK_USE_FLEXBISON \ - RDK_INSTALL_STATIC_LIBS RDK_SWIG_STATIC RDK_PGSQL_STATIC + RDK_INSTALL_STATIC_LIBS RDK_SWIG_STATIC RDK_PGSQL_STATIC \ + RDK_OPTIMIZE_NATIVE CMAKE_ARGS= -DFREEBSD_DOCSDIR:PATH=${DOCSDIR} -DCATCH_DIR=${LOCALBASE} DATADIR= ${PREFIX}/share/RDKit @@ -45,6 +46,14 @@ PYTHON_RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR} PORTDOCS= * + +.include + +.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH:Marm*} || ${ARCH} == i386 || ${ARCH:Mmips*el*} || ${ARCH} == riscv +PLIST_SUB+= LITTLE_ENDIAN="" +.else +PLIST_SUB+= LITTLE_ENDIAN="@comment " +.endif post-extract: @${MKDIR} ${WRKSRC}/External/rapidjson-1.1.0 Modified: head/science/rdkit/pkg-plist ============================================================================== --- head/science/rdkit/pkg-plist Tue Aug 20 00:08:46 2019 (r509388) +++ head/science/rdkit/pkg-plist Tue Aug 20 00:08:48 2019 (r509389) @@ -295,9 +295,9 @@ include/rdkit/RDGeneral/test.h include/rdkit/RDGeneral/types.h include/rdkit/RDGeneral/utils.h include/rdkit/RDGeneral/versions.h -include/rdkit/SimDivPickers/DistPicker.h -include/rdkit/SimDivPickers/HierarchicalClusterPicker.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/MaxMinPicker.h lib/cmake/rdkit/rdkit-config-version.cmake lib/cmake/rdkit/rdkit-config.cmake lib/cmake/rdkit/rdkit-targets-%%CMAKE_BUILD_TYPE%%.cmake @@ -416,9 +416,9 @@ lib/libRDKitSLNParse.so.1.%%SHLIB_VER%% lib/libRDKitShapeHelpers.so lib/libRDKitShapeHelpers.so.1 lib/libRDKitShapeHelpers.so.1.%%SHLIB_VER%% -lib/libRDKitSimDivPickers.so -lib/libRDKitSimDivPickers.so.1 -lib/libRDKitSimDivPickers.so.1.%%SHLIB_VER%% +%%LITTLE_ENDIAN%%lib/libRDKitSimDivPickers.so +%%LITTLE_ENDIAN%%lib/libRDKitSimDivPickers.so.1 +%%LITTLE_ENDIAN%%lib/libRDKitSimDivPickers.so.1.%%SHLIB_VER%% lib/libRDKitSmilesParse.so lib/libRDKitSmilesParse.so.1 lib/libRDKitSmilesParse.so.1.%%SHLIB_VER%% @@ -440,9 +440,9 @@ lib/libRDKitTrajectory.so.1.%%SHLIB_VER%% lib/libRDKitcoordgenlib.so lib/libRDKitcoordgenlib.so.1 lib/libRDKitcoordgenlib.so.1.%%SHLIB_VER%% -lib/libRDKithc.so -lib/libRDKithc.so.1 -lib/libRDKithc.so.1.%%SHLIB_VER%% +%%LITTLE_ENDIAN%%lib/libRDKithc.so +%%LITTLE_ENDIAN%%lib/libRDKithc.so.1 +%%LITTLE_ENDIAN%%lib/libRDKithc.so.1.%%SHLIB_VER%% lib/libRDKitmaeparser.so lib/libRDKitmaeparser.so.1 lib/libRDKitmaeparser.so.1.%%SHLIB_VER%% @@ -640,7 +640,7 @@ lib/libRDKitmaeparser.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 @@ -724,7 +724,7 @@ lib/libRDKitmaeparser.so.1.%%SHLIB_VER%% %%PYTHON%%%%PYTHON_SITELIBDIR%%/rdkit/RDRandom.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/rdkit/SimDivFilters/SimilarityPickers.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/rdkit/SimDivFilters/__init__.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/rdkit/SimDivFilters/rdSimDivPickers.so +%%LITTLE_ENDIAN%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/rdkit/SimDivFilters/rdSimDivPickers.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/rdkit/TestRunner.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/rdkit/VLib/Filter.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/rdkit/VLib/Node.py