summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/cmake
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/cmake')
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc4
-rw-r--r--meta/recipes-devtools/cmake/cmake/0001-FindBoost-Boost-1.66.0-dependency-and-release-update.patch52
-rw-r--r--meta/recipes-devtools/cmake/cmake/0001-FindBoost-Fix-incorrect-alphabetisation-of-headers-l.patch29
-rw-r--r--meta/recipes-devtools/cmake/cmake/0002-FindBoost-Implement-Architecture-and-Address-Model-t.patch132
-rw-r--r--meta/recipes-devtools/cmake/cmake/0003-FindBoost-Search-for-upstream-packaged-libs-next-to-.patch31
5 files changed, 248 insertions, 0 deletions
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index 9357079df4..394c9ebb55 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -16,6 +16,10 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
16 file://support-oe-qt4-tools-names.patch \ 16 file://support-oe-qt4-tools-names.patch \
17 file://qt4-fail-silent.patch \ 17 file://qt4-fail-silent.patch \
18 file://cmake-Prevent-the-detection-of-Qt5.patch \ 18 file://cmake-Prevent-the-detection-of-Qt5.patch \
19 file://0001-FindBoost-Boost-1.66.0-dependency-and-release-update.patch \
20 file://0001-FindBoost-Fix-incorrect-alphabetisation-of-headers-l.patch \
21 file://0002-FindBoost-Implement-Architecture-and-Address-Model-t.patch \
22 file://0003-FindBoost-Search-for-upstream-packaged-libs-next-to-.patch \
19 " 23 "
20 24
21SRC_URI[md5sum] = "1c38c67295ca696aeafd8c059d748b38" 25SRC_URI[md5sum] = "1c38c67295ca696aeafd8c059d748b38"
diff --git a/meta/recipes-devtools/cmake/cmake/0001-FindBoost-Boost-1.66.0-dependency-and-release-update.patch b/meta/recipes-devtools/cmake/cmake/0001-FindBoost-Boost-1.66.0-dependency-and-release-update.patch
new file mode 100644
index 0000000000..fda60e3f1f
--- /dev/null
+++ b/meta/recipes-devtools/cmake/cmake/0001-FindBoost-Boost-1.66.0-dependency-and-release-update.patch
@@ -0,0 +1,52 @@
1From 433a2d495a2481c63b82c11a30f7c642d6abe63f Mon Sep 17 00:00:00 2001
2From: "Paul \"TBBle\" Hampson" <Paul.Hampson@Pobox.com>
3Date: Fri, 29 Dec 2017 19:55:49 +1100
4Subject: [PATCH] FindBoost: Boost 1.66.0 dependency and release update
5
6Release notes: http://www.boost.org/users/history/version_1_66_0.html
7
8* All new libraries are header-only.
9* _Boost_COMPONENT_DEPENDENCIES is unchanged from 1.65.1
10* _Boost_FIBER_COMPILER_FEATURES is unchanged from 1.64.0
11
12Upstream-Status: Backport
13[Yocto 12762]
14Signed-off-by: Armin Kuster <akuster808@gmail.com>
15
16---
17 Modules/FindBoost.cmake | 8 ++++----
18 1 file changed, 4 insertions(+), 4 deletions(-)
19
20Index: cmake-3.10.3/Modules/FindBoost.cmake
21===================================================================
22--- cmake-3.10.3.orig/Modules/FindBoost.cmake
23+++ cmake-3.10.3/Modules/FindBoost.cmake
24@@ -797,7 +797,7 @@ function(_Boost_COMPONENT_DEPENDENCIES c
25 set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
26 set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
27 endif()
28- if(NOT Boost_VERSION VERSION_LESS 106600)
29+ if(NOT Boost_VERSION VERSION_LESS 106700)
30 message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets")
31 set(_Boost_IMPORTED_TARGETS FALSE)
32 endif()
33@@ -931,8 +931,8 @@ endfunction()
34 # `${Boost_ROOT}/libs/fiber/build/Jamfile.v2`.
35 #
36 function(_Boost_COMPILER_FEATURES component _ret)
37- # Boost >= 1.62 and < 1.65
38- if(NOT Boost_VERSION VERSION_LESS 106200 AND Boost_VERSION VERSION_LESS 106500)
39+ # Boost >= 1.62 and < 1.67
40+ if(NOT Boost_VERSION VERSION_LESS 106200 AND Boost_VERSION VERSION_LESS 106700)
41 set(_Boost_FIBER_COMPILER_FEATURES
42 cxx_alias_templates
43 cxx_auto_type
44@@ -1038,7 +1038,7 @@ else()
45 # _Boost_COMPONENT_HEADERS. See the instructions at the top of
46 # _Boost_COMPONENT_DEPENDENCIES.
47 set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
48- "1.65.1" "1.65.0" "1.65"
49+ "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65"
50 "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60"
51 "1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55"
52 "1.54.0" "1.54" "1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51"
diff --git a/meta/recipes-devtools/cmake/cmake/0001-FindBoost-Fix-incorrect-alphabetisation-of-headers-l.patch b/meta/recipes-devtools/cmake/cmake/0001-FindBoost-Fix-incorrect-alphabetisation-of-headers-l.patch
new file mode 100644
index 0000000000..a45eda5201
--- /dev/null
+++ b/meta/recipes-devtools/cmake/cmake/0001-FindBoost-Fix-incorrect-alphabetisation-of-headers-l.patch
@@ -0,0 +1,29 @@
1From b1e9f67137733bc109d355450fcd06edda4784c5 Mon Sep 17 00:00:00 2001
2From: "Paul \"TBBle\" Hampson" <Paul.Hampson@Pobox.com>
3Date: Fri, 29 Dec 2017 20:07:31 +1100
4Subject: [PATCH 1/6] FindBoost: Fix incorrect alphabetisation of headers list
5
6Affects cmake < 3.11.0
7
8Upsteam-Status: Backport
9[Yocto 12762]
10Signed-off-by: Armin Kuster <akuster808@gmail.com>
11
12---
13 Modules/FindBoost.cmake | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16Index: cmake-3.10.3/Modules/FindBoost.cmake
17===================================================================
18--- cmake-3.10.3.orig/Modules/FindBoost.cmake
19+++ cmake-3.10.3/Modules/FindBoost.cmake
20@@ -831,8 +831,8 @@ function(_Boost_COMPONENT_HEADERS compon
21 set(_Boost_CONTAINER_HEADERS "boost/container/container_fwd.hpp")
22 set(_Boost_CONTEXT_HEADERS "boost/context/all.hpp")
23 set(_Boost_COROUTINE_HEADERS "boost/coroutine/all.hpp")
24- set(_Boost_EXCEPTION_HEADERS "boost/exception/exception.hpp")
25 set(_Boost_DATE_TIME_HEADERS "boost/date_time/date.hpp")
26+ set(_Boost_EXCEPTION_HEADERS "boost/exception/exception.hpp")
27 set(_Boost_FIBER_HEADERS "boost/fiber/all.hpp")
28 set(_Boost_FILESYSTEM_HEADERS "boost/filesystem/path.hpp")
29 set(_Boost_GRAPH_HEADERS "boost/graph/adjacency_list.hpp")
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 @@
1From b044f69a413123f15a05034c00a8e3763764a1e5 Mon Sep 17 00:00:00 2001
2From: "Paul \"TBBle\" Hampson" <Paul.Hampson@Pobox.com>
3Date: Fri, 29 Dec 2017 21:50:54 +1100
4Subject: [PATCH 2/6] FindBoost: Implement "Architecture and Address Model" tag
5
6This tag is new in Boost 1.66.0, and is present in the 'versioned'
7library file name layout.
8
9Affects cmake < 3.11.0
10
11Upsteam-Status: Backport
12[Yocto 12762]
13Signed-off-by: Armin Kuster <akuster808@gmail.com>
14
15---
16 Modules/FindBoost.cmake | 52 +++++++++++++++++++++++++++++++++++++++----------
17 1 file changed, 42 insertions(+), 10 deletions(-)
18
19Index: 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")
diff --git a/meta/recipes-devtools/cmake/cmake/0003-FindBoost-Search-for-upstream-packaged-libs-next-to-.patch b/meta/recipes-devtools/cmake/cmake/0003-FindBoost-Search-for-upstream-packaged-libs-next-to-.patch
new file mode 100644
index 0000000000..5178f5c4dc
--- /dev/null
+++ b/meta/recipes-devtools/cmake/cmake/0003-FindBoost-Search-for-upstream-packaged-libs-next-to-.patch
@@ -0,0 +1,31 @@
1From d56deff7d127b030739bd0034609d0046121d8cd Mon Sep 17 00:00:00 2001
2From: "Paul \"TBBle\" Hampson" <Paul.Hampson@Pobox.com>
3Date: Fri, 29 Dec 2017 22:38:36 +1100
4Subject: [PATCH 3/6] FindBoost: Search for upstream-packaged libs next to
5 includes
6
7Upstream packages Boost binaries for Windows with the 'boost' directory
8(the INCLUDE_DIR) next to the lib-... directory (the LIBRARY_DIR).
9
10Affects cmake < 3.11.0
11
12Upsteam-Status: Backport
13[Yocto 12762]
14Signed-off-by: Armin Kuster <akuster808@gmail.com>
15
16---
17 Modules/FindBoost.cmake | 1 +
18 1 file changed, 1 insertion(+)
19
20Index: cmake-3.10.3/Modules/FindBoost.cmake
21===================================================================
22--- cmake-3.10.3.orig/Modules/FindBoost.cmake
23+++ cmake-3.10.3/Modules/FindBoost.cmake
24@@ -1502,6 +1502,7 @@ foreach(c DEBUG RELEASE)
25 ${Boost_INCLUDE_DIR}/stage/lib
26 )
27 _Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} "${Boost_INCLUDE_DIR}/..")
28+ _Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} "${Boost_INCLUDE_DIR}")
29 if( Boost_NO_SYSTEM_PATHS )
30 list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH)
31 else()