diff options
Diffstat (limited to 'meta/recipes-devtools/cmake/cmake/0002-FindBoost-Implement-Architecture-and-Address-Model-t.patch')
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/0002-FindBoost-Implement-Architecture-and-Address-Model-t.patch | 132 |
1 files changed, 132 insertions, 0 deletions
diff --git a/meta/recipes-devtools/cmake/cmake/0002-FindBoost-Implement-Architecture-and-Address-Model-t.patch b/meta/recipes-devtools/cmake/cmake/0002-FindBoost-Implement-Architecture-and-Address-Model-t.patch new file mode 100644 index 0000000000..88301c64c0 --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake/0002-FindBoost-Implement-Architecture-and-Address-Model-t.patch | |||
@@ -0,0 +1,132 @@ | |||
1 | From b044f69a413123f15a05034c00a8e3763764a1e5 Mon Sep 17 00:00:00 2001 | ||
2 | From: "Paul \"TBBle\" Hampson" <Paul.Hampson@Pobox.com> | ||
3 | Date: Fri, 29 Dec 2017 21:50:54 +1100 | ||
4 | Subject: [PATCH 2/6] FindBoost: Implement "Architecture and Address Model" tag | ||
5 | |||
6 | This tag is new in Boost 1.66.0, and is present in the 'versioned' | ||
7 | library file name layout. | ||
8 | |||
9 | Affects cmake < 3.11.0 | ||
10 | |||
11 | Upsteam-Status: Backport | ||
12 | [Yocto 12762] | ||
13 | Signed-off-by: Armin Kuster <akuster808@gmail.com> | ||
14 | |||
15 | --- | ||
16 | Modules/FindBoost.cmake | 52 +++++++++++++++++++++++++++++++++++++++---------- | ||
17 | 1 file changed, 42 insertions(+), 10 deletions(-) | ||
18 | |||
19 | Index: cmake-3.10.3/Modules/FindBoost.cmake | ||
20 | =================================================================== | ||
21 | --- cmake-3.10.3.orig/Modules/FindBoost.cmake | ||
22 | +++ cmake-3.10.3/Modules/FindBoost.cmake | ||
23 | @@ -1385,8 +1385,11 @@ if(Boost_DEBUG) | ||
24 | endif() | ||
25 | |||
26 | #====================== | ||
27 | -# Systematically build up the Boost ABI tag | ||
28 | -# http://boost.org/doc/libs/1_41_0/more/getting_started/windows.html#library-naming | ||
29 | +# Systematically build up the Boost ABI tag for the 'tagged' and 'versioned' layouts | ||
30 | +# http://boost.org/doc/libs/1_66_0/more/getting_started/windows.html#library-naming | ||
31 | +# http://boost.org/doc/libs/1_66_0/boost/config/auto_link.hpp | ||
32 | +# http://boost.org/doc/libs/1_66_0/tools/build/src/tools/common.jam | ||
33 | +# http://boost.org/doc/libs/1_66_0/boostcpp.jam | ||
34 | set( _boost_RELEASE_ABI_TAG "-") | ||
35 | set( _boost_DEBUG_ABI_TAG "-") | ||
36 | # Key Use this library when: | ||
37 | @@ -1418,11 +1421,40 @@ if(Boost_USE_STLPORT) | ||
38 | string(APPEND _boost_DEBUG_ABI_TAG "p") | ||
39 | endif() | ||
40 | # n using the STLport deprecated "native iostreams" feature | ||
41 | +# removed from the documentation in 1.43.0 but still present in | ||
42 | +# boost/config/auto_link.hpp | ||
43 | if(Boost_USE_STLPORT_DEPRECATED_NATIVE_IOSTREAMS) | ||
44 | string(APPEND _boost_RELEASE_ABI_TAG "n") | ||
45 | string(APPEND _boost_DEBUG_ABI_TAG "n") | ||
46 | endif() | ||
47 | |||
48 | +# -x86 Architecture and address model tag | ||
49 | +# First character is the architecture, then word-size, either 32 or 64 | ||
50 | +# Only used in 'versioned' layout, added in Boost 1.66.0 | ||
51 | +set(_boost_ARCHITECTURE_TAG "") | ||
52 | +# {CMAKE_CXX_COMPILER_ARCHITECTURE_ID} is not currently set for all compilers | ||
53 | +if(NOT "x${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "x" AND NOT Boost_VERSION VERSION_LESS 106600) | ||
54 | + string(APPEND _boost_ARCHITECTURE_TAG "-") | ||
55 | + # This needs to be kept in-sync with the section of CMakePlatformId.h.in | ||
56 | + # inside 'defined(_WIN32) && defined(_MSC_VER)' | ||
57 | + if(${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} STREQUAL "IA64") | ||
58 | + string(APPEND _boost_ARCHITECTURE_TAG "i") | ||
59 | + elseif(${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} STREQUAL "X86" | ||
60 | + OR ${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} STREQUAL "x64") | ||
61 | + string(APPEND _boost_ARCHITECTURE_TAG "x") | ||
62 | + elseif(${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} MATCHES "^ARM") | ||
63 | + string(APPEND _boost_ARCHITECTURE_TAG "a") | ||
64 | + elseif(${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} STREQUAL "MIPS") | ||
65 | + string(APPEND _boost_ARCHITECTURE_TAG "m") | ||
66 | + endif() | ||
67 | + | ||
68 | + if(CMAKE_SIZEOF_VOID_P EQUAL 8) | ||
69 | + string(APPEND _boost_ARCHITECTURE_TAG "64") | ||
70 | + else() | ||
71 | + string(APPEND _boost_ARCHITECTURE_TAG "32") | ||
72 | + endif() | ||
73 | +endif() | ||
74 | + | ||
75 | if(Boost_DEBUG) | ||
76 | message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " | ||
77 | "_boost_RELEASE_ABI_TAG = ${_boost_RELEASE_ABI_TAG}") | ||
78 | @@ -1616,22 +1648,22 @@ foreach(COMPONENT ${Boost_FIND_COMPONENT | ||
79 | unset(_boost_RELEASE_NAMES) | ||
80 | foreach(compiler IN LISTS _boost_COMPILER) | ||
81 | list(APPEND _boost_RELEASE_NAMES | ||
82 | - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} | ||
83 | + ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION} | ||
84 | ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} ) | ||
85 | endforeach() | ||
86 | list(APPEND _boost_RELEASE_NAMES | ||
87 | - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} | ||
88 | + ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION} | ||
89 | ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} | ||
90 | ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} ) | ||
91 | if(_boost_STATIC_RUNTIME_WORKAROUND) | ||
92 | set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}") | ||
93 | foreach(compiler IN LISTS _boost_COMPILER) | ||
94 | list(APPEND _boost_RELEASE_NAMES | ||
95 | - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} | ||
96 | + ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION} | ||
97 | ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) | ||
98 | endforeach() | ||
99 | list(APPEND _boost_RELEASE_NAMES | ||
100 | - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} | ||
101 | + ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION} | ||
102 | ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) | ||
103 | endif() | ||
104 | if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") | ||
105 | @@ -1666,11 +1698,11 @@ foreach(COMPONENT ${Boost_FIND_COMPONENT | ||
106 | unset(_boost_DEBUG_NAMES) | ||
107 | foreach(compiler IN LISTS _boost_COMPILER) | ||
108 | list(APPEND _boost_DEBUG_NAMES | ||
109 | - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} | ||
110 | + ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION} | ||
111 | ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} ) | ||
112 | endforeach() | ||
113 | list(APPEND _boost_DEBUG_NAMES | ||
114 | - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} | ||
115 | + ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION} | ||
116 | ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} | ||
117 | ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED} | ||
118 | ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} ) | ||
119 | @@ -1678,11 +1710,11 @@ foreach(COMPONENT ${Boost_FIND_COMPONENT | ||
120 | set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}") | ||
121 | foreach(compiler IN LISTS _boost_COMPILER) | ||
122 | list(APPEND _boost_DEBUG_NAMES | ||
123 | - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} | ||
124 | + ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION} | ||
125 | ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) | ||
126 | endforeach() | ||
127 | list(APPEND _boost_DEBUG_NAMES | ||
128 | - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} | ||
129 | + ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION} | ||
130 | ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) | ||
131 | endif() | ||
132 | if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") | ||