Attachment 206157 Details for Bug 239299 – v2

[patch] v2

rdkit.patch (text/plain), 3.92 KB, created by Piotr Kubaj on 2019-07-30 14:45:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2019-07-30 14:45:43 UTC

Size: 3.92 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 507525)
>+++ Makefile	(working copy)
>@@ -17,7 +17,7 @@
> 		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
>@@ -24,7 +24,8 @@
> 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
>@@ -46,6 +47,14 @@
> 
> PORTDOCS=	*
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${ARCH} == powerpc64
>+PLIST_SUB+=	PPC64=""
>+.else
>+PLIST_SUB+=	PPC64="@comment "
>+.endif
>+
> post-extract:
> 	@${MKDIR} ${WRKSRC}/External/rapidjson-1.1.0
> 	@cd ${WRKSRC}/External/rapidjson-1.1.0 && ${LN} -s ${LOCALBASE}/include/rapidjson include
>@@ -54,4 +63,4 @@
> 	#@${MKDIR} ${STAGEDIR}${PREFIX}/lib/cmake
> 	#@${MV} ${STAGEDIR}${PREFIX}/lib/*.cmake ${STAGEDIR}${PREFIX}/lib/cmake
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 507525)
>+++ pkg-plist	(working copy)
>@@ -295,9 +295,9 @@
> 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
>+%%PPC64%%include/rdkit/SimDivPickers/DistPicker.h
>+%%PPC64%%include/rdkit/SimDivPickers/HierarchicalClusterPicker.h
>+%%PPC64%%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/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%%
>+%%PPC64%%lib/libRDKitSimDivPickers.so
>+%%PPC64%%lib/libRDKitSimDivPickers.so.1
>+%%PPC64%%lib/libRDKitSimDivPickers.so.1.%%SHLIB_VER%%
> lib/libRDKitSmilesParse.so
> lib/libRDKitSmilesParse.so.1
> lib/libRDKitSmilesParse.so.1.%%SHLIB_VER%%
>@@ -440,9 +440,9 @@
> 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%%
>+%%PPC64%%lib/libRDKithc.so
>+%%PPC64%%lib/libRDKithc.so.1
>+%%PPC64%%lib/libRDKithc.so.1.%%SHLIB_VER%%
> lib/libRDKitmaeparser.so
> lib/libRDKitmaeparser.so.1
> lib/libRDKitmaeparser.so.1.%%SHLIB_VER%%
>@@ -640,7 +640,7 @@
> %%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
>+%%PPC64%%%%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 @@
> %%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
>+%%PPC64%%%%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

Flags:

yuri: maintainer-approval+

Actions: View | Diff

Attachments on bug 239299: 205885 | 206157