/[gentoo-x86]/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch
Gentoo

Contents of /dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Mon Jan 30 22:28:45 2012 UTC (2 years, 8 months ago) by tampakrap
Branch: MAIN
Fix detection of PYTHON_ABI-versioned Boost Python libraries of >=dev-libs/boost-1.48, bug 400969

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

1 --- Modules/FindBoost.cmake
2 +++ Modules/FindBoost.cmake
3 @@ -953,6 +953,11 @@
4 set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
5 set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)")
6
7 + if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
8 + # CPython-specific version of _PYTHON_ABI_EXTRACTION_COMMAND variable from python.eclass.
9 + execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_abi)
10 + endif()
11 +
12 #
13 # Find RELEASE libraries
14 #
15 @@ -962,6 +967,14 @@
16 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
17 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
18 ${Boost_LIB_PREFIX}boost_${COMPONENT} )
19 + if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
20 + list(APPEND _boost_RELEASE_NAMES
21 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
22 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
23 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
24 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
25 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi} )
26 + endif()
27 if(_boost_STATIC_RUNTIME_WORKAROUND)
28 set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
29 list(APPEND _boost_RELEASE_NAMES
30 @@ -969,6 +982,13 @@
31 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
32 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
33 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
34 + if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
35 + list(APPEND _boost_RELEASE_NAMES
36 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
37 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
38 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
39 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
40 + endif()
41 endif()
42 if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
43 _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
44 @@ -994,6 +1014,15 @@
45 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
46 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
47 ${Boost_LIB_PREFIX}boost_${COMPONENT} )
48 + if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
49 + list(APPEND _boost_DEBUG_NAMES
50 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
51 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
52 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
53 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
54 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}
55 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi} )
56 + endif()
57 if(_boost_STATIC_RUNTIME_WORKAROUND)
58 set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
59 list(APPEND _boost_DEBUG_NAMES
60 @@ -1001,6 +1030,13 @@
61 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
62 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
63 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
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_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
67 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
68 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
69 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
70 + endif()
71 endif()
72 if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
73 _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})

  ViewVC Help
Powered by ViewVC 1.1.20