From owner-svn-ports-all@freebsd.org Mon Apr 27 17:08:37 2020 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 BAC402C02D2; Mon, 27 Apr 2020 17:08:37 +0000 (UTC) (envelope-from fluffy@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 499rpF4ZCzz4M4B; Mon, 27 Apr 2020 17:08:37 +0000 (UTC) (envelope-from fluffy@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 982DEDE01; Mon, 27 Apr 2020 17:08:37 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03RH8bI5021011; Mon, 27 Apr 2020 17:08:37 GMT (envelope-from fluffy@FreeBSD.org) Received: (from fluffy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03RH8bam021008; Mon, 27 Apr 2020 17:08:37 GMT (envelope-from fluffy@FreeBSD.org) Message-Id: <202004271708.03RH8bam021008@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fluffy set sender to fluffy@FreeBSD.org using -f From: Dima Panov Date: Mon, 27 Apr 2020 17:08:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r533156 - head/devel/boost-python-libs X-SVN-Group: ports-head X-SVN-Commit-Author: fluffy X-SVN-Commit-Paths: head/devel/boost-python-libs X-SVN-Commit-Revision: 533156 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: Mon, 27 Apr 2020 17:08:37 -0000 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 + +.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 +.include 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%%