From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7EC11139694 for ; Thu, 23 Mar 2017 12:20:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6125DE0C39; Thu, 23 Mar 2017 12:20:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2586EE0C39 for ; Thu, 23 Mar 2017 12:20:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A52253415A2 for ; Thu, 23 Mar 2017 12:20:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 137327227 for ; Thu, 23 Mar 2017 12:20:10 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1490271603.c61eff3f68a45d5b25653c8022f97634fab20f36.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/cmake/cmake-3.7.2-r1.ebuild dev-util/cmake/cmake-3.7.2-r10.ebuild dev-util/cmake/cmake-3.8.0_rc2-r1.ebuild dev-util/cmake/cmake-3.8.0_rc2.ebuild dev-util/cmake/files/cmake-3.8.0_rc2-FindBoost-python.patch X-VCS-Directories: dev-util/cmake/files/ dev-util/cmake/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: c61eff3f68a45d5b25653c8022f97634fab20f36 X-VCS-Branch: master Date: Thu, 23 Mar 2017 12:20:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 490b0635-b469-424e-a47e-6eabb5831557 X-Archives-Hash: 80a749601ef16d95ad89c3ddadca3f32 commit: c61eff3f68a45d5b25653c8022f97634fab20f36 Author: Lars Wendler gentoo org> AuthorDate: Thu Mar 23 12:01:05 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Mar 23 12:20:03 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c61eff3f dev-util/cmake: Attempt to fix FindBoost-python patch (bug #613442). Package-Manager: Portage-2.3.5, Repoman-2.3.2 ...make-3.7.2-r10.ebuild => cmake-3.7.2-r1.ebuild} | 8 +- dev-util/cmake/cmake-3.7.2-r10.ebuild | 2 +- ...-3.8.0_rc2.ebuild => cmake-3.8.0_rc2-r1.ebuild} | 2 +- .../files/cmake-3.8.0_rc2-FindBoost-python.patch | 95 ++++++++++++++++++++++ 4 files changed, 99 insertions(+), 8 deletions(-) diff --git a/dev-util/cmake/cmake-3.7.2-r10.ebuild b/dev-util/cmake/cmake-3.7.2-r1.ebuild similarity index 96% copy from dev-util/cmake/cmake-3.7.2-r10.ebuild copy to dev-util/cmake/cmake-3.7.2-r1.ebuild index d706bdb8a29..f2c467a0459 100644 --- a/dev-util/cmake/cmake-3.7.2-r10.ebuild +++ b/dev-util/cmake/cmake-3.7.2-r1.ebuild @@ -10,8 +10,7 @@ MY_P="${P/_/-}" DESCRIPTION="Cross platform Make" HOMEPAGE="http://www.cmake.org/" -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz -https://dev.gentoo.org/~kensington/distfiles/${PN}-3.7.2-x32.patch.xz" +SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" LICENSE="CMake" SLOT="0" @@ -52,7 +51,7 @@ PATCHES=( # handle gentoo packaging in find modules "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch - "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch + "${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch @@ -61,9 +60,6 @@ PATCHES=( "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch # upstream fixes (can usually be removed with a version bump) - - # testing 3.9 backports - bug #426936 - "${WORKDIR}"/${PN}-3.7.2-x32.patch ) cmake_src_bootstrap() { diff --git a/dev-util/cmake/cmake-3.7.2-r10.ebuild b/dev-util/cmake/cmake-3.7.2-r10.ebuild index d706bdb8a29..e2f29fb2645 100644 --- a/dev-util/cmake/cmake-3.7.2-r10.ebuild +++ b/dev-util/cmake/cmake-3.7.2-r10.ebuild @@ -52,7 +52,7 @@ PATCHES=( # handle gentoo packaging in find modules "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch - "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch + "${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch diff --git a/dev-util/cmake/cmake-3.8.0_rc2.ebuild b/dev-util/cmake/cmake-3.8.0_rc2-r1.ebuild similarity index 99% rename from dev-util/cmake/cmake-3.8.0_rc2.ebuild rename to dev-util/cmake/cmake-3.8.0_rc2-r1.ebuild index 60d04535120..b5e7affd517 100644 --- a/dev-util/cmake/cmake-3.8.0_rc2.ebuild +++ b/dev-util/cmake/cmake-3.8.0_rc2-r1.ebuild @@ -52,7 +52,7 @@ PATCHES=( # handle gentoo packaging in find modules "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch - "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch + "${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch diff --git a/dev-util/cmake/files/cmake-3.8.0_rc2-FindBoost-python.patch b/dev-util/cmake/files/cmake-3.8.0_rc2-FindBoost-python.patch new file mode 100644 index 00000000000..441650b72a2 --- /dev/null +++ b/dev-util/cmake/files/cmake-3.8.0_rc2-FindBoost-python.patch @@ -0,0 +1,95 @@ +From 7d3a5c466bf14a0c12edc6ece359012b723e39bc Mon Sep 17 00:00:00 2001 +From: Michael Palimaka +Date: Thu, 23 Mar 2017 11:36:39 +0100 +Subject: [PATCH] Fix detection of PYTHON_ABI-versioned Boost Python libraries + +Gentoo-bug: 400969 +Gentoo-bug: 613442 +--- + Modules/FindBoost.cmake | 42 ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 42 insertions(+) + +diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake +index e795aadcc..11269c30b 100644 +--- a/Modules/FindBoost.cmake ++++ b/Modules/FindBoost.cmake +@@ -1481,6 +1481,16 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) + set( _boost_docstring_release "Boost ${COMPONENT} library (release)") + set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)") + ++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") ++ # If a certain version of python has already been selected ensure we select the corresponding boost python version. ++ if(PYTHON_EXECUTABLE) ++ set(GENTOO_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE}") ++ else() ++ set(GENTOO_PYTHON_EXECUTABLE "python") ++ endif() ++ execute_process(COMMAND "${GENTOO_PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version) ++ endif() ++ + # Compute component-specific hints. + set(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT "") + if(${COMPONENT} STREQUAL "mpi" OR ${COMPONENT} STREQUAL "mpi_python" OR +@@ -1529,6 +1539,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) + ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} + ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} + ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} ) ++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") ++ list(APPEND _boost_RELEASE_NAMES ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} ) ++ endif() ++ + if(_boost_STATIC_RUNTIME_WORKAROUND) + set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}") + list(APPEND _boost_RELEASE_NAMES +@@ -1536,6 +1555,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) + ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} + ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} + ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) ++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") ++ list(APPEND _boost_RELEASE_NAMES ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) ++ endif() + endif() + if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") + _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES}) +@@ -1571,6 +1597,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) + ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} + ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED} + ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} ) ++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") ++ list(APPEND _boost_DEBUG_NAMES ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} ) ++ endif() + if(_boost_STATIC_RUNTIME_WORKAROUND) + set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}") + list(APPEND _boost_DEBUG_NAMES +@@ -1578,6 +1613,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) + ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} + ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} + ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) ++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") ++ list(APPEND _boost_DEBUG_NAMES ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) ++ endif() + endif() + if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") + _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES}) +-- +2.12.1 +