Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Theo Chatzimichos (tampakrap)" <tampakrap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-util/cmake/files: cmake-2.8.7-FindBoost-python.patch
Date: Mon, 30 Jan 2012 22:28:54
Message-Id: 20120130222845.26A392004B@flycatcher.gentoo.org
1 tampakrap 12/01/30 22:28:45
2
3 Added: cmake-2.8.7-FindBoost-python.patch
4 Log:
5 Fix detection of PYTHON_ABI-versioned Boost Python libraries of >=dev-libs/boost-1.48, bug 400969
6
7 (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch?rev=1.1&content-type=text/plain
14
15 Index: cmake-2.8.7-FindBoost-python.patch
16 ===================================================================
17 --- Modules/FindBoost.cmake
18 +++ Modules/FindBoost.cmake
19 @@ -953,6 +953,11 @@
20 set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
21 set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)")
22
23 + if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
24 + # CPython-specific version of _PYTHON_ABI_EXTRACTION_COMMAND variable from python.eclass.
25 + execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_abi)
26 + endif()
27 +
28 #
29 # Find RELEASE libraries
30 #
31 @@ -962,6 +967,14 @@
32 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
33 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
34 ${Boost_LIB_PREFIX}boost_${COMPONENT} )
35 + if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
36 + list(APPEND _boost_RELEASE_NAMES
37 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
38 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
39 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
40 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
41 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi} )
42 + endif()
43 if(_boost_STATIC_RUNTIME_WORKAROUND)
44 set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
45 list(APPEND _boost_RELEASE_NAMES
46 @@ -969,6 +982,13 @@
47 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
48 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
49 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
50 + if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
51 + list(APPEND _boost_RELEASE_NAMES
52 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
53 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
54 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
55 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
56 + endif()
57 endif()
58 if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
59 _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
60 @@ -994,6 +1014,15 @@
61 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
62 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
63 ${Boost_LIB_PREFIX}boost_${COMPONENT} )
64 + if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
65 + list(APPEND _boost_DEBUG_NAMES
66 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
67 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
68 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
69 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
70 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}
71 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi} )
72 + endif()
73 if(_boost_STATIC_RUNTIME_WORKAROUND)
74 set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
75 list(APPEND _boost_DEBUG_NAMES
76 @@ -1001,6 +1030,13 @@
77 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
78 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
79 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
80 + if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
81 + list(APPEND _boost_DEBUG_NAMES
82 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
83 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
84 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
85 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
86 + endif()
87 endif()
88 if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
89 _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})
Report Message
Find on MARC Find on Google Groups