Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 27 Apr 2020 17:08:37 +0000 (UTC)
From:      Dima Panov <fluffy@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r533156 - head/devel/boost-python-libs
Message-ID:  <202004271708.03RH8bam021008@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: fluffy
Date: Mon Apr 27 17:08:36 2020
New Revision: 533156
URL: https://svnweb.freebsd.org/changeset/ports/533156

Log:
  devel/boost-python-libs: allow to install .cmake configs
   for boost_python and boost_numpy libraries
   in same way as it always doing for boot-libs package
  
  Common for all flavors .cmake files will be installed only with default python version.
  For all non-default flavors package will provide only versioned parts.
  
  PR:		245560
  Submitted by:	fluffy
  Reviewed by:	lwhsu
  Approved by:	office (lwhsu)

Modified:
  head/devel/boost-python-libs/Makefile
  head/devel/boost-python-libs/pkg-plist

Modified: head/devel/boost-python-libs/Makefile
==============================================================================
--- head/devel/boost-python-libs/Makefile	Mon Apr 27 16:52:17 2020	(r533155)
+++ head/devel/boost-python-libs/Makefile	Mon Apr 27 17:08:36 2020	(r533156)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	boost-libs
+PORTREVISION=	1
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 COMMENT=	Framework for interfacing Python and C++
@@ -27,6 +28,14 @@ MAKE_ENV+=	PYTHON_ROOT="${LOCALBASE}"\
 MAKE_ARGS+=	--with-python
 ALL_TARGET=	stage
 
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_VER} == ${PYTHON_DEFAULT}
+PLIST_SUB+=	PY_DEFAULT_ONLY=""
+.else
+PLIST_SUB+=	PY_DEFAULT_ONLY="@comment "
+.endif
+
 pre-build:
 	@${ECHO_CMD} "using python : " ${PYTHON_VER} " : " ${PYTHON_CMD} " : " ${PYTHON_INCLUDEDIR} ";" >> ${WRKSRC}/tools/build/src/site-config.jam
 
@@ -34,6 +43,15 @@ do-install:
 	@cd ${WRKSRC}/stage/lib && ${PAX} -rw -p p libboost* ${STAGEDIR}${PREFIX}/lib
 # For some reasons BJAM forget about the links
 	@cd ${WRKSRC}/stage/ && ${FIND} lib -type l | ${PAX} -rw -p p ${STAGEDIR}${PREFIX}
+# CMake part
+	@cd ${WRKSRC}/stage/lib && ${PAX} -rw -p p cmake/boost_numpy*/*-py${PYTHON_VER}.cmake ${STAGEDIR}${PREFIX}/lib
+	@cd ${WRKSRC}/stage/lib && ${PAX} -rw -p p cmake/boost_python*/*-py${PYTHON_VER}.cmake ${STAGEDIR}${PREFIX}/lib
+.if ${PYTHON_VER} == ${PYTHON_DEFAULT}
+	@cd ${WRKSRC}/stage/lib && ${PAX} -rw -p p cmake/boost_numpy*/*-config*.cmake ${STAGEDIR}${PREFIX}/lib
+	@cd ${WRKSRC}/stage/lib && ${PAX} -rw -p p cmake/boost_python*/*-config*.cmake ${STAGEDIR}${PREFIX}/lib
+.endif
+	@${FIND} ${STAGEDIR}${PREFIX}/lib/cmake -type f -exec \
+		${REINPLACE_CMD} -i '' -e 's,${STAGEDIR},,' {} +
 
 post-install:
 # display pkg-message
@@ -49,4 +67,4 @@ post-install:
 		-e "s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g" ${PKGMESSAGE}
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libboost_python*.so.${PORTVERSION}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/devel/boost-python-libs/pkg-plist
==============================================================================
--- head/devel/boost-python-libs/pkg-plist	Mon Apr 27 16:52:17 2020	(r533155)
+++ head/devel/boost-python-libs/pkg-plist	Mon Apr 27 17:08:36 2020	(r533156)
@@ -1,3 +1,11 @@
+%%PY_DEFAULT_ONLY%%lib/cmake/boost_numpy-%%BOOST_SHARED_LIB_VER%%/boost_numpy-config-version.cmake
+%%PY_DEFAULT_ONLY%%lib/cmake/boost_numpy-%%BOOST_SHARED_LIB_VER%%/boost_numpy-config.cmake
+lib/cmake/boost_numpy-%%BOOST_SHARED_LIB_VER%%/libboost_numpy-variant-shared-py%%PYTHON_VER%%.cmake
+lib/cmake/boost_numpy-%%BOOST_SHARED_LIB_VER%%/libboost_numpy-variant-static-py%%PYTHON_VER%%.cmake
+%%PY_DEFAULT_ONLY%%lib/cmake/boost_python-%%BOOST_SHARED_LIB_VER%%/boost_python-config-version.cmake
+%%PY_DEFAULT_ONLY%%lib/cmake/boost_python-%%BOOST_SHARED_LIB_VER%%/boost_python-config.cmake
+lib/cmake/boost_python-%%BOOST_SHARED_LIB_VER%%/libboost_python-variant-shared-py%%PYTHON_VER%%.cmake
+lib/cmake/boost_python-%%BOOST_SHARED_LIB_VER%%/libboost_python-variant-static-py%%PYTHON_VER%%.cmake
 lib/libboost_numpy%%PYTHON_SUFFIX%%.a
 lib/libboost_numpy%%PYTHON_SUFFIX%%.so
 lib/libboost_numpy%%PYTHON_SUFFIX%%.so.%%MAJOR_VER%%



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