Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 400969 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-1 / +37 lines)
Line  Link Here
0
-- Modules/FindBoost.cmake
0
++ Modules/FindBoost.cmake
Lines 953-958 Link Here
953
    set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
953
    set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
954
    set( _boost_docstring_debug   "Boost ${COMPONENT} library (debug)")
954
    set( _boost_docstring_debug   "Boost ${COMPONENT} library (debug)")
955
955
956
    if(${COMPONENT} STREQUAL "python")
957
      # CPython-specific version of _PYTHON_ABI_EXTRACTION_COMMAND variable from python.eclass.
958
      execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_abi)
959
    endif()
960
956
    #
961
    #
957
    # Find RELEASE libraries
962
    # Find RELEASE libraries
958
    #
963
    #
Lines 962-967 Link Here
962
      ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
967
      ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
963
      ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
968
      ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
964
      ${Boost_LIB_PREFIX}boost_${COMPONENT} )
969
      ${Boost_LIB_PREFIX}boost_${COMPONENT} )
970
    if(${COMPONENT} STREQUAL "python")
971
      list(APPEND _boost_RELEASE_NAMES
972
        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
973
        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
974
        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
975
        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
976
        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi} )
977
    endif()
965
    if(_boost_STATIC_RUNTIME_WORKAROUND)
978
    if(_boost_STATIC_RUNTIME_WORKAROUND)
966
      set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
979
      set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
967
      list(APPEND _boost_RELEASE_NAMES
980
      list(APPEND _boost_RELEASE_NAMES
Lines 969-974 Link Here
969
        ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
982
        ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
970
        ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
983
        ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
971
        ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
984
        ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
985
      if(${COMPONENT} STREQUAL "python")
986
        list(APPEND _boost_RELEASE_NAMES
987
          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
988
          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
989
          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
990
          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
991
      endif()
972
    endif()
992
    endif()
973
    if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
993
    if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
974
       _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
994
       _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
Lines 994-999 Link Here
994
      ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
1014
      ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
995
      ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
1015
      ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
996
      ${Boost_LIB_PREFIX}boost_${COMPONENT} )
1016
      ${Boost_LIB_PREFIX}boost_${COMPONENT} )
1017
    if(${COMPONENT} STREQUAL "python")
1018
      list(APPEND _boost_DEBUG_NAMES
1019
       ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
1020
       ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
1021
       ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
1022
       ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
1023
       ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}
1024
       ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi} )
1025
    endif()
997
    if(_boost_STATIC_RUNTIME_WORKAROUND)
1026
    if(_boost_STATIC_RUNTIME_WORKAROUND)
998
      set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
1027
      set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
999
      list(APPEND _boost_DEBUG_NAMES
1028
      list(APPEND _boost_DEBUG_NAMES
Lines 1001-1006 Link Here
1001
        ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
1030
        ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
1002
        ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
1031
        ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
1003
        ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
1032
        ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
1033
      if(${COMPONENT} STREQUAL "python")
1034
        list(APPEND _boost_DEBUG_NAMES
1035
         ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
1036
         ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
1037
         ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
1038
         ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
1039
      endif()
1004
    endif()
1040
    endif()
1005
    if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
1041
    if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
1006
       _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})
1042
       _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})

Return to bug 400969