summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2018-07-05 11:18:33 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-06 22:55:02 +0100
commit87b9992ae710cc405b1e4a07a5bfc7a283e80664 (patch)
treecf6c982da619b7992fbc5606d86c98f1c227656b /meta/recipes-devtools
parent93e9729569963355e2cb5526f9613f117205d1d3 (diff)
downloadpoky-87b9992ae710cc405b1e4a07a5bfc7a283e80664.tar.gz
cmake: Update 3.10.3 -> 3.11.4
This updates CMake to the current stable release and drop many backported patches in the process. (From OE-Core rev: d942ec4ff649782d22afe49fd48839dbbfedc871) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/cmake/cmake-native_3.11.4.bb (renamed from meta/recipes-devtools/cmake/cmake-native_3.10.3.bb)4
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc21
-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/0001-cmake-Prevent-the-detection-of-Qt5.patch122
-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/0002-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch (renamed from meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch)15
-rw-r--r--meta/recipes-devtools/cmake/cmake/0003-Fail-silently-if-system-Qt-installation-is-broken.patch (renamed from meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch)13
-rw-r--r--meta/recipes-devtools/cmake/cmake/0003-FindBoost-Search-for-upstream-packaged-libs-next-to-.patch31
-rw-r--r--meta/recipes-devtools/cmake/cmake/0004-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch (renamed from meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch)18
-rw-r--r--meta/recipes-devtools/cmake/cmake/0004-FindBoost-Generate-imported-targets-for-future-Boost.patch35
-rw-r--r--meta/recipes-devtools/cmake/cmake/0005-FindBoost-support-OPTIONAL_COMPONENTS.patch42
-rw-r--r--meta/recipes-devtools/cmake/cmake/0006-FindBoost-Add-support-for-Boost-1.67-with-Python-ver.patch296
-rw-r--r--meta/recipes-devtools/cmake/cmake/cmake-Prevent-the-detection-of-Qt5.patch215
-rw-r--r--meta/recipes-devtools/cmake/cmake_3.11.4.bb (renamed from meta/recipes-devtools/cmake/cmake_3.10.3.bb)0
15 files changed, 163 insertions, 862 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.10.3.bb b/meta/recipes-devtools/cmake/cmake-native_3.11.4.bb
index e55e8b1cf6..9f371e9b0c 100644
--- a/meta/recipes-devtools/cmake/cmake-native_3.10.3.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_3.11.4.bb
@@ -3,9 +3,7 @@ inherit native
3 3
4DEPENDS += "bzip2-replacement-native expat-native xz-native zlib-native curl-native" 4DEPENDS += "bzip2-replacement-native expat-native xz-native zlib-native curl-native"
5 5
6SRC_URI += "\ 6SRC_URI += "file://0004-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch"
7 file://cmlibarchive-disable-ext2fs.patch \
8"
9 7
10B = "${WORKDIR}/build" 8B = "${WORKDIR}/build"
11do_configure[cleandirs] = "${B}" 9do_configure[cleandirs] = "${B}"
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index 533db6ae86..436363e4e3 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -6,26 +6,19 @@ HOMEPAGE = "http://www.cmake.org/"
6BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" 6BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php"
7SECTION = "console/utils" 7SECTION = "console/utils"
8LICENSE = "BSD" 8LICENSE = "BSD"
9LIC_FILES_CHKSUM = "file://Copyright.txt;md5=79b5b78197c74d5c5f9c7ccadeee4e8c \ 9LIC_FILES_CHKSUM = "file://Copyright.txt;md5=891b81f415fb25fbad03e41f87fd5dfb \
10 file://Source/cmake.h;md5=4494dee184212fc89c469c3acd555a14;beginline=1;endline=3 \ 10 file://Source/cmake.h;md5=4494dee184212fc89c469c3acd555a14;beginline=1;endline=3 \
11 " 11 "
12 12
13CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" 13CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
14 14
15SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ 15SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
16 file://support-oe-qt4-tools-names.patch \ 16 file://0001-cmake-Prevent-the-detection-of-Qt5.patch \
17 file://qt4-fail-silent.patch \ 17 file://0002-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch \
18 file://cmake-Prevent-the-detection-of-Qt5.patch \ 18 file://0003-Fail-silently-if-system-Qt-installation-is-broken.patch \
19 file://0001-FindBoost-Boost-1.66.0-dependency-and-release-update.patch \ 19"
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 \
23 file://0004-FindBoost-Generate-imported-targets-for-future-Boost.patch \
24 file://0005-FindBoost-support-OPTIONAL_COMPONENTS.patch \
25 file://0006-FindBoost-Add-support-for-Boost-1.67-with-Python-ver.patch \
26 "
27 20
28SRC_URI[md5sum] = "1c38c67295ca696aeafd8c059d748b38" 21SRC_URI[md5sum] = "72e168b3bad2f9c34dcebbad7af56ff0"
29SRC_URI[sha256sum] = "0c3a1dcf0be03e40cf4f341dda79c96ffb6c35ae35f2f911845b72dab3559cf8" 22SRC_URI[sha256sum] = "8f864e9f78917de3e1483e256270daabc4a321741592c5b36af028e72bff87f5"
30 23
31UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" 24UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
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
deleted file mode 100644
index fda60e3f1f..0000000000
--- a/meta/recipes-devtools/cmake/cmake/0001-FindBoost-Boost-1.66.0-dependency-and-release-update.patch
+++ /dev/null
@@ -1,52 +0,0 @@
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
deleted file mode 100644
index b3a75206f7..0000000000
--- a/meta/recipes-devtools/cmake/cmake/0001-FindBoost-Fix-incorrect-alphabetisation-of-headers-l.patch
+++ /dev/null
@@ -1,29 +0,0 @@
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
8Upstream-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/0001-cmake-Prevent-the-detection-of-Qt5.patch b/meta/recipes-devtools/cmake/cmake/0001-cmake-Prevent-the-detection-of-Qt5.patch
new file mode 100644
index 0000000000..b4976e918b
--- /dev/null
+++ b/meta/recipes-devtools/cmake/cmake/0001-cmake-Prevent-the-detection-of-Qt5.patch
@@ -0,0 +1,122 @@
1From 0f60f3922bc85994fcde5079ce5a52f9b51f6915 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Wed, 17 Jan 2018 10:02:14 -0200
4Subject: [PATCH 1/4] cmake: Prevent the detection of Qt5
5Organization: O.S. Systems Software LTDA.
6
7CMake doesn't have dependency on qt4/qt5, so these tests usually fail
8but still can cause undeterministic results or build failures (when
9OE_QMAKE_PATH_EXTERNAL_HOST_BINS is undefined or native qmake removed
10while running the test in cmake)
11
12Upstream-Status: Inappropriate [configuration]
13
14Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
15---
16 Source/QtDialog/CMakeLists.txt | 2 +-
17 Tests/CMakeLists.txt | 2 +-
18 Tests/Qt4And5Automoc/CMakeLists.txt | 4 ++--
19 Tests/QtAutogen/AutogenTest.cmake | 2 +-
20 Tests/QtAutogen/MacOsFW/CMakeLists.txt | 2 +-
21 Tests/RunCMake/CMakeLists.txt | 2 +-
22 Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake | 2 +-
23 7 files changed, 8 insertions(+), 8 deletions(-)
24
25diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
26index 330b74729..e7709dee6 100644
27--- a/Source/QtDialog/CMakeLists.txt
28+++ b/Source/QtDialog/CMakeLists.txt
29@@ -6,7 +6,7 @@ if(POLICY CMP0020)
30 cmake_policy(SET CMP0020 NEW) # Drop when CMake >= 2.8.11 required
31 endif()
32 CMake_OPTIONAL_COMPONENT(cmake-gui)
33-find_package(Qt5Widgets QUIET)
34+#find_package(Qt5Widgets QUIET)
35 if (Qt5Widgets_FOUND)
36 include_directories(${Qt5Widgets_INCLUDE_DIRS})
37 add_definitions(${Qt5Widgets_DEFINITONS})
38diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
39index 08bfebe0e..dd4d7f4fb 100644
40--- a/Tests/CMakeLists.txt
41+++ b/Tests/CMakeLists.txt
42@@ -1260,7 +1260,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
43 set(CMake_TEST_Qt5 1)
44 endif()
45 if(CMake_TEST_Qt5)
46- find_package(Qt5Widgets QUIET NO_MODULE)
47+ #find_package(Qt5Widgets QUIET NO_MODULE)
48 endif()
49 if(CMake_TEST_Qt5 AND Qt5Widgets_FOUND)
50 add_subdirectory(Qt5Autogen)
51diff --git a/Tests/Qt4And5Automoc/CMakeLists.txt b/Tests/Qt4And5Automoc/CMakeLists.txt
52index ad74961d9..a9dd74b15 100644
53--- a/Tests/Qt4And5Automoc/CMakeLists.txt
54+++ b/Tests/Qt4And5Automoc/CMakeLists.txt
55@@ -3,11 +3,11 @@ cmake_minimum_required(VERSION 2.8.12)
56 project(Qt4And5Automoc)
57
58 if (QT_REVERSE_FIND_ORDER)
59- find_package(Qt5Core REQUIRED)
60+ #find_package(Qt5Core REQUIRED)
61 find_package(Qt4 REQUIRED)
62 else()
63 find_package(Qt4 REQUIRED)
64- find_package(Qt5Core REQUIRED)
65+ #find_package(Qt5Core REQUIRED)
66 endif()
67
68 set(CMAKE_AUTOMOC ON)
69diff --git a/Tests/QtAutogen/AutogenTest.cmake b/Tests/QtAutogen/AutogenTest.cmake
70index 8c0a14fca..e9923b21a 100644
71--- a/Tests/QtAutogen/AutogenTest.cmake
72+++ b/Tests/QtAutogen/AutogenTest.cmake
73@@ -22,7 +22,7 @@ if (QT_TEST_VERSION STREQUAL 4)
74 endmacro()
75
76 elseif(QT_TEST_VERSION STREQUAL 5)
77- find_package(Qt5Widgets REQUIRED)
78+ #find_package(Qt5Widgets REQUIRED)
79
80 set(QT_QTCORE_TARGET Qt5::Core)
81 set(QT_QTGUI_TARGET Qt5::Widgets)
82diff --git a/Tests/QtAutogen/MacOsFW/CMakeLists.txt b/Tests/QtAutogen/MacOsFW/CMakeLists.txt
83index 26d201926..e48e1c8de 100644
84--- a/Tests/QtAutogen/MacOsFW/CMakeLists.txt
85+++ b/Tests/QtAutogen/MacOsFW/CMakeLists.txt
86@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10)
87 project(MacOsFW)
88 include("../AutogenTest.cmake")
89
90-find_package(Qt5Test REQUIRED)
91+#find_package(Qt5Test REQUIRED)
92
93 set(CMAKE_CXX_STANDARD 11)
94 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin)
95diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
96index c52f44ece..d39cd8828 100644
97--- a/Tests/RunCMake/CMakeLists.txt
98+++ b/Tests/RunCMake/CMakeLists.txt
99@@ -285,7 +285,7 @@ add_RunCMake_test(configure_file)
100 add_RunCMake_test(CTestTimeoutAfterMatch)
101
102 find_package(Qt4 QUIET)
103-find_package(Qt5Core QUIET)
104+#find_package(Qt5Core QUIET)
105 if (QT4_FOUND AND Qt5Core_FOUND AND NOT Qt5Core_VERSION VERSION_LESS 5.1.0)
106 add_RunCMake_test(IncompatibleQt)
107 endif()
108diff --git a/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake b/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake
109index 4fccdc418..b76e1e531 100644
110--- a/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake
111+++ b/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake
112@@ -1,6 +1,6 @@
113
114 find_package(Qt4 REQUIRED)
115-find_package(Qt5Core REQUIRED)
116+#find_package(Qt5Core REQUIRED)
117
118 add_executable(mainexe main.cpp)
119 target_link_libraries(mainexe Qt4::QtCore Qt5::Core)
120--
1212.18.0
122
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
deleted file mode 100644
index d5d442a519..0000000000
--- a/meta/recipes-devtools/cmake/cmake/0002-FindBoost-Implement-Architecture-and-Address-Model-t.patch
+++ /dev/null
@@ -1,132 +0,0 @@
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
11Upstream-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/support-oe-qt4-tools-names.patch b/meta/recipes-devtools/cmake/cmake/0002-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch
index 6841554763..acbe961c64 100644
--- a/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch
+++ b/meta/recipes-devtools/cmake/cmake/0002-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch
@@ -1,7 +1,8 @@
1From 10b8b523869124d2fc8cd98d9e028c0bcffd61b1 Mon Sep 17 00:00:00 2001 1From 5fc9c33a7d6781008877b19dfdf0a526a50524f2 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br> 2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Thu, 12 May 2011 15:36:03 +0000 3Date: Thu, 12 May 2011 15:36:03 +0000
4Subject: [PATCH 1/2] cmake: support OpenEmbedded Qt4 tool binary names 4Subject: [PATCH 2/4] cmake: support OpenEmbedded Qt4 tool binary names
5Organization: O.S. Systems Software LTDA.
5 6
6The FindQt4 module looks for Qt4 binaries to be able to gather the 7The FindQt4 module looks for Qt4 binaries to be able to gather the
7paths used for compilation and also to be using during other processes 8paths used for compilation and also to be using during other processes
@@ -18,16 +19,16 @@ The patch was slightly adapted in order to match cmake 3.2.2:
18Instead of find_program, _find_qt4_program is now used. 19Instead of find_program, _find_qt4_program is now used.
19 20
20Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de> 21Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de>
21 22Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
22--- 23---
23 Modules/FindQt4.cmake | 10 +++++----- 24 Modules/FindQt4.cmake | 10 +++++-----
24 1 file changed, 5 insertions(+), 5 deletions(-) 25 1 file changed, 5 insertions(+), 5 deletions(-)
25 26
26diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake 27diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
27index c67d0be..0cf169b 100644 28index 5a7eadb96..d48a5bfd1 100644
28--- a/Modules/FindQt4.cmake 29--- a/Modules/FindQt4.cmake
29+++ b/Modules/FindQt4.cmake 30+++ b/Modules/FindQt4.cmake
30@@ -516,7 +516,7 @@ endfunction() 31@@ -517,7 +517,7 @@ endfunction()
31 32
32 set(QT4_INSTALLED_VERSION_TOO_OLD FALSE) 33 set(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
33 34
@@ -36,7 +37,7 @@ index c67d0be..0cf169b 100644
36 _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION) 37 _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION)
37 38
38 if (QT_QMAKE_EXECUTABLE AND 39 if (QT_QMAKE_EXECUTABLE AND
39@@ -1142,12 +1142,12 @@ if (QT_QMAKE_EXECUTABLE AND 40@@ -1143,12 +1143,12 @@ if (QT_QMAKE_EXECUTABLE AND
40 _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc-qt4 moc4 moc) 41 _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc-qt4 moc4 moc)
41 _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic-qt4 uic4 uic) 42 _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic-qt4 uic4 uic)
42 _find_qt4_program(QT_UIC3_EXECUTABLE Qt4::uic3 uic3) 43 _find_qt4_program(QT_UIC3_EXECUTABLE Qt4::uic3 uic3)
@@ -54,5 +55,5 @@ index c67d0be..0cf169b 100644
54 _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4 linguist4 linguist) 55 _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4 linguist4 linguist)
55 56
56-- 57--
572.7.4 582.18.0
58 59
diff --git a/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch b/meta/recipes-devtools/cmake/cmake/0003-Fail-silently-if-system-Qt-installation-is-broken.patch
index 80fc277fa2..301da0221d 100644
--- a/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch
+++ b/meta/recipes-devtools/cmake/cmake/0003-Fail-silently-if-system-Qt-installation-is-broken.patch
@@ -1,4 +1,8 @@
1Fail silently if system Qt installation is broken 1From b30da754a32213b5a0b3698f88e1302e5b18518b Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Thu, 5 Jul 2018 10:26:48 -0300
4Subject: [PATCH 3/4] Fail silently if system Qt installation is broken
5Organization: O.S. Systems Software LTDA.
2 6
3Fixes a regression in behaviour from 2.8.10 to 2.8.11 resulting in the 7Fixes a regression in behaviour from 2.8.10 to 2.8.11 resulting in the
4following error if the system Qt installation is broken: 8following error if the system Qt installation is broken:
@@ -18,15 +22,16 @@ Another set_property was introduced which had to be included
18within the if(QT_QTCORE_FOUND) statement. 22within the if(QT_QTCORE_FOUND) statement.
19 23
20Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de> 24Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de>
25Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
21--- 26---
22 Modules/FindQt4.cmake | 39 ++++++++++++++++++++------------------- 27 Modules/FindQt4.cmake | 39 ++++++++++++++++++++-------------------
23 1 file changed, 20 insertions(+), 19 deletions(-) 28 1 file changed, 20 insertions(+), 19 deletions(-)
24 29
25diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake 30diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
26index 6704769..9048e35 100644 31index d48a5bfd1..e6f22fe9b 100644
27--- a/Modules/FindQt4.cmake 32--- a/Modules/FindQt4.cmake
28+++ b/Modules/FindQt4.cmake 33+++ b/Modules/FindQt4.cmake
29@@ -1000,25 +1000,26 @@ if (QT_QMAKE_EXECUTABLE AND 34@@ -995,25 +995,26 @@ if (QT_QMAKE_EXECUTABLE AND
30 endif() 35 endif()
31 endmacro() 36 endmacro()
32 37
@@ -73,5 +78,5 @@ index 6704769..9048e35 100644
73 foreach(QT_MODULE ${QT_MODULES}) 78 foreach(QT_MODULE ${QT_MODULES})
74 _QT4_ADJUST_LIB_VARS(${QT_MODULE}) 79 _QT4_ADJUST_LIB_VARS(${QT_MODULE})
75-- 80--
761.9.1 812.18.0
77 82
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
deleted file mode 100644
index a44fa3e366..0000000000
--- a/meta/recipes-devtools/cmake/cmake/0003-FindBoost-Search-for-upstream-packaged-libs-next-to-.patch
+++ /dev/null
@@ -1,31 +0,0 @@
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
12Upstream-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()
diff --git a/meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch b/meta/recipes-devtools/cmake/cmake/0004-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch
index bf3671259e..91dea4cbba 100644
--- a/meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch
+++ b/meta/recipes-devtools/cmake/cmake/0004-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch
@@ -1,4 +1,9 @@
1Disable use of ext2fs/ext2_fs.h by cmake's internal libarchive copy 1From d9aa3f7c075dbd0db386995a44a2240ecdbb2c56 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Thu, 5 Jul 2018 10:28:04 -0300
4Subject: [PATCH 4/4] Disable use of ext2fs/ext2_fs.h by cmake's internal
5 libarchive copy
6Organization: O.S. Systems Software LTDA.
2 7
3We don't want to add a dependency on e2fsprogs-native for cmake-native, 8We don't want to add a dependency on e2fsprogs-native for cmake-native,
4and we don't use CPack so just disable this functionality. 9and we don't use CPack so just disable this functionality.
@@ -6,10 +11,16 @@ and we don't use CPack so just disable this functionality.
6Upstream-Status: Inappropriate [config] 11Upstream-Status: Inappropriate [config]
7 12
8Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> 13Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
14Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
15---
16 Utilities/cmlibarchive/CMakeLists.txt | 8 ++------
17 1 file changed, 2 insertions(+), 6 deletions(-)
9 18
19diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
20index 206f3c6a5..642fb0dd9 100644
10--- a/Utilities/cmlibarchive/CMakeLists.txt 21--- a/Utilities/cmlibarchive/CMakeLists.txt
11+++ b/Utilities/cmlibarchive/CMakeLists.txt 22+++ b/Utilities/cmlibarchive/CMakeLists.txt
12@@ -237,12 +237,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H) 23@@ -400,12 +400,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H)
13 LA_CHECK_INCLUDE_FILE("direct.h" HAVE_DIRECT_H) 24 LA_CHECK_INCLUDE_FILE("direct.h" HAVE_DIRECT_H)
14 LA_CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H) 25 LA_CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H)
15 LA_CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H) 26 LA_CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H)
@@ -24,3 +35,6 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
24 LA_CHECK_INCLUDE_FILE("fcntl.h" HAVE_FCNTL_H) 35 LA_CHECK_INCLUDE_FILE("fcntl.h" HAVE_FCNTL_H)
25 LA_CHECK_INCLUDE_FILE("grp.h" HAVE_GRP_H) 36 LA_CHECK_INCLUDE_FILE("grp.h" HAVE_GRP_H)
26 LA_CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H) 37 LA_CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H)
38--
392.18.0
40
diff --git a/meta/recipes-devtools/cmake/cmake/0004-FindBoost-Generate-imported-targets-for-future-Boost.patch b/meta/recipes-devtools/cmake/cmake/0004-FindBoost-Generate-imported-targets-for-future-Boost.patch
deleted file mode 100644
index 8101e8f479..0000000000
--- a/meta/recipes-devtools/cmake/cmake/0004-FindBoost-Generate-imported-targets-for-future-Boost.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 6297d6c7fd6f80dafe17c0aefeeb0439432aa4b0 Mon Sep 17 00:00:00 2001
2From: "Paul \"TBBle\" Hampson" <Paul.Hampson@Pobox.com>
3Date: Sat, 30 Dec 2017 16:00:29 +1100
4Subject: [PATCH 4/6] FindBoost: Generate imported targets for future Boost
5 versions
6
7Per discussion on cmake/cmake#17575, this protection not particularly
8valuable, as the dependency information which the imported targets wrap
9is generated anyway.
10
11This removes a road-block for using `Boost_ADDITIONAL_VERSIONS` to
12support newly-released Boost versions pending a new CMake release.
13
14Affects cmake < 3.11.0
15
16Upstream-Status: Backport
17[Yocto 12762]
18Signed-off-by: Armin Kuster <akuster808@gmail.com>
19
20---
21 Modules/FindBoost.cmake | 1 -
22 1 file changed, 1 deletion(-)
23
24Index: cmake-3.10.3/Modules/FindBoost.cmake
25===================================================================
26--- cmake-3.10.3.orig/Modules/FindBoost.cmake
27+++ cmake-3.10.3/Modules/FindBoost.cmake
28@@ -799,7 +799,6 @@ function(_Boost_COMPONENT_DEPENDENCIES c
29 endif()
30 if(NOT Boost_VERSION VERSION_LESS 106700)
31 message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets")
32- set(_Boost_IMPORTED_TARGETS FALSE)
33 endif()
34 endif()
35
diff --git a/meta/recipes-devtools/cmake/cmake/0005-FindBoost-support-OPTIONAL_COMPONENTS.patch b/meta/recipes-devtools/cmake/cmake/0005-FindBoost-support-OPTIONAL_COMPONENTS.patch
deleted file mode 100644
index c0330fb335..0000000000
--- a/meta/recipes-devtools/cmake/cmake/0005-FindBoost-support-OPTIONAL_COMPONENTS.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 2557cad5ec5084f86d4bb56c82939a49fc9d3071 Mon Sep 17 00:00:00 2001
2From: Sergiu Deitsch <sergiu.deitsch@gmail.com>
3Date: Sun, 14 Jan 2018 11:42:48 +0100
4Subject: [PATCH 5/6] FindBoost: support OPTIONAL_COMPONENTS
5
6Affects cmake < 3.11.0
7
8Upstream-Status: Backport
9[Yocto 12762]
10Signed-off-by: Armin Kuster <akuster808@gmail.com>
11
12---
13 Modules/FindBoost.cmake | 8 +++++---
14 1 file changed, 5 insertions(+), 3 deletions(-)
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@@ -13,6 +13,9 @@
21 # [version] [EXACT] # Minimum or EXACT version e.g. 1.36.0
22 # [REQUIRED] # Fail with error if Boost is not found
23 # [COMPONENTS <libs>...] # Boost libraries by their canonical name
24+# # e.g. "date_time" for "libboost_date_time"
25+# [OPTIONAL_COMPONENTS <libs>...]
26+# # Optional Boost libraries by their canonical name)
27 # ) # e.g. "date_time" for "libboost_date_time"
28 #
29 # This module finds headers and requested component libraries OR a CMake
30@@ -1783,10 +1786,9 @@ if(Boost_FOUND)
31 set(_boost_CHECKED_COMPONENT FALSE)
32 set(_Boost_MISSING_COMPONENTS "")
33 foreach(COMPONENT ${Boost_FIND_COMPONENTS})
34- string(TOUPPER ${COMPONENT} COMPONENT)
35+ string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
36 set(_boost_CHECKED_COMPONENT TRUE)
37- if(NOT Boost_${COMPONENT}_FOUND)
38- string(TOLOWER ${COMPONENT} COMPONENT)
39+ if(NOT Boost_${UPPERCOMPONENT}_FOUND AND Boost_FIND_REQUIRED_${COMPONENT})
40 list(APPEND _Boost_MISSING_COMPONENTS ${COMPONENT})
41 endif()
42 endforeach()
diff --git a/meta/recipes-devtools/cmake/cmake/0006-FindBoost-Add-support-for-Boost-1.67-with-Python-ver.patch b/meta/recipes-devtools/cmake/cmake/0006-FindBoost-Add-support-for-Boost-1.67-with-Python-ver.patch
deleted file mode 100644
index edcfdbefa5..0000000000
--- a/meta/recipes-devtools/cmake/cmake/0006-FindBoost-Add-support-for-Boost-1.67-with-Python-ver.patch
+++ /dev/null
@@ -1,296 +0,0 @@
1From 1673923c303c6a4184904c4c5849911feddb87e7 Mon Sep 17 00:00:00 2001
2From: Roger Leigh <rleigh@codelibre.net>
3Date: Sun, 18 Mar 2018 13:05:35 +0000
4Subject: [PATCH 6/6] FindBoost: Add support for Boost 1.67 with Python version
5 suffixes
6
7Fixes: #16612, #16335, #16391, #12955
8
9Affects cmake < 3.11.0
10
11Upstream-Status: Backport
12[Yocto 12762]
13Signed-off-by: Armin Kuster <akuster808@gmail.com>
14
15---
16 Modules/FindBoost.cmake | 170 ++++++++++++++++++++++++++++++++++++------------
17 1 file changed, 129 insertions(+), 41 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@@ -10,7 +10,7 @@
24 # Use this module by invoking find_package with the form::
25 #
26 # find_package(Boost
27-# [version] [EXACT] # Minimum or EXACT version e.g. 1.36.0
28+# [version] [EXACT] # Minimum or EXACT version e.g. 1.67.0
29 # [REQUIRED] # Fail with error if Boost is not found
30 # [COMPONENTS <libs>...] # Boost libraries by their canonical name
31 # # e.g. "date_time" for "libboost_date_time"
32@@ -40,6 +40,15 @@
33 # information about Boost's automatic linking
34 # displayed during compilation
35 #
36+# Note that Boost Python components require a Python version suffix
37+# (Boost 1.67 and later), e.g. ``python36`` or ``python27`` for the
38+# versions built against Python 3.6 and 2.7, respectively. This also
39+# applies to additional components using Python including
40+# ``mpi_python`` and ``numpy``. Earlier Boost releases may use
41+# distribution-specific suffixes such as ``2``, ``3`` or ``2.7``.
42+# These may also be used as suffixes, but note that they are not
43+# portable.
44+#
45 # This module reads hints about search locations from variables::
46 #
47 # BOOST_ROOT - Preferred installation prefix
48@@ -156,7 +165,7 @@
49 # Boost_REALPATH - Set to ON to resolve symlinks for discovered
50 # libraries to assist with packaging. For example,
51 # the "system" component library may be resolved to
52-# "/usr/lib/libboost_system.so.1.42.0" instead of
53+# "/usr/lib/libboost_system.so.1.67.0" instead of
54 # "/usr/lib/libboost_system.so". This does not
55 # affect linking and should not be enabled unless
56 # the user needs this information.
57@@ -190,6 +199,13 @@
58 # target_link_libraries(foo Boost::date_time Boost::filesystem
59 # Boost::iostreams)
60 #
61+# Example to find Boost Python 3.6 libraries and use imported targets::
62+#
63+# find_package(Boost 1.67 REQUIRED COMPONENTS
64+# python36 numpy36)
65+# add_executable(foo foo.cc)
66+# target_link_libraries(foo Boost::python36 Boost::numpy36)
67+#
68 # Example to find Boost headers and some *static* (release only) libraries::
69 #
70 # set(Boost_USE_STATIC_LIBS ON) # only find static libs
71@@ -197,7 +213,7 @@
72 # set(Boost_USE_RELEASE_LIBS ON) # only find release libs
73 # set(Boost_USE_MULTITHREADED ON)
74 # set(Boost_USE_STATIC_RUNTIME OFF)
75-# find_package(Boost 1.36.0 COMPONENTS date_time filesystem system ...)
76+# find_package(Boost 1.66.0 COMPONENTS date_time filesystem system ...)
77 # if(Boost_FOUND)
78 # include_directories(${Boost_INCLUDE_DIRS})
79 # add_executable(foo foo.cc)
80@@ -565,6 +581,13 @@ function(_Boost_COMPONENT_DEPENDENCIES c
81 # required only if the BoostScanDeps.cmake script logic is changed.
82 # The addition of a new release should only require it to be run
83 # against the new release.
84+
85+ # Handle Python version suffixes
86+ if(component MATCHES "^(python|mpi_python|numpy)([0-9][0-9]?|[0-9]\\.[0-9])\$")
87+ set(component "${CMAKE_MATCH_1}")
88+ set(component_python_version "${CMAKE_MATCH_2}")
89+ endif()
90+
91 set(_Boost_IMPORTED_TARGETS TRUE)
92 if(Boost_VERSION VERSION_LESS 103300)
93 message(WARNING "Imported targets and dependency information not available for Boost version ${Boost_VERSION} (all versions older than 1.33)")
94@@ -782,8 +805,7 @@ function(_Boost_COMPONENT_DEPENDENCIES c
95 set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
96 set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
97 set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
98- else()
99- if(NOT Boost_VERSION VERSION_LESS 106500)
100+ elseif(NOT Boost_VERSION VERSION_LESS 106500 AND Boost_VERSION VERSION_LESS 106700)
101 set(_Boost_CHRONO_DEPENDENCIES system)
102 set(_Boost_CONTEXT_DEPENDENCIES thread chrono system date_time)
103 set(_Boost_COROUTINE_DEPENDENCIES context system)
104@@ -797,10 +819,29 @@ function(_Boost_COMPONENT_DEPENDENCIES c
105 set(_Boost_NUMPY_DEPENDENCIES python)
106 set(_Boost_RANDOM_DEPENDENCIES system)
107 set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
108+ set(_Boost_TIMER_DEPENDENCIES chrono system)
109 set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
110 set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
111- endif()
112+ else()
113 if(NOT Boost_VERSION VERSION_LESS 106700)
114+ set(_Boost_CHRONO_DEPENDENCIES system)
115+ set(_Boost_CONTEXT_DEPENDENCIES thread chrono system date_time)
116+ set(_Boost_COROUTINE_DEPENDENCIES context system)
117+ set(_Boost_FIBER_DEPENDENCIES context thread chrono system date_time)
118+ set(_Boost_FILESYSTEM_DEPENDENCIES system)
119+ set(_Boost_IOSTREAMS_DEPENDENCIES regex)
120+ set(_Boost_LOG_DEPENDENCIES date_time log_setup system filesystem thread regex chrono atomic)
121+ set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l atomic)
122+ set(_Boost_MPI_DEPENDENCIES serialization)
123+ set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization)
124+ set(_Boost_NUMPY_DEPENDENCIES python${component_python_version})
125+ set(_Boost_RANDOM_DEPENDENCIES system)
126+ set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
127+ set(_Boost_TIMER_DEPENDENCIES chrono system)
128+ set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
129+ set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
130+ endif()
131+ if(NOT Boost_VERSION VERSION_LESS 106800)
132 message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets")
133 endif()
134 endif()
135@@ -826,6 +867,12 @@ endfunction()
136 # _hdrs
137 #
138 function(_Boost_COMPONENT_HEADERS component _hdrs)
139+ # Handle Python version suffixes
140+ if(component MATCHES "^(python|mpi_python|numpy)([0-9][0-9]?|[0-9]\\.[0-9])\$")
141+ set(component "${CMAKE_MATCH_1}")
142+ set(component_python_version "${CMAKE_MATCH_2}")
143+ endif()
144+
145 # Note: new boost components will require adding here. The header
146 # must be present in all versions of Boost providing a library.
147 set(_Boost_ATOMIC_HEADERS "boost/atomic.hpp")
148@@ -1040,7 +1087,7 @@ else()
149 # _Boost_COMPONENT_HEADERS. See the instructions at the top of
150 # _Boost_COMPONENT_DEPENDENCIES.
151 set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
152- "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65"
153+ "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65"
154 "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"
155 "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"
156 "1.54.0" "1.54" "1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51"
157@@ -1619,7 +1666,44 @@ foreach(COMPONENT ${Boost_FIND_COMPONENT
158 endforeach()
159 endif()
160
161+ # Handle Python version suffixes
162+ unset(COMPONENT_PYTHON_VERSION_MAJOR)
163+ unset(COMPONENT_PYTHON_VERSION_MINOR)
164+ if(${COMPONENT} MATCHES "^(python|mpi_python|numpy)([0-9])\$")
165+ set(COMPONENT_UNVERSIONED "${CMAKE_MATCH_1}")
166+ set(COMPONENT_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}")
167+ elseif(${COMPONENT} MATCHES "^(python|mpi_python|numpy)([0-9])\\.?([0-9])\$")
168+ set(COMPONENT_UNVERSIONED "${CMAKE_MATCH_1}")
169+ set(COMPONENT_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}")
170+ set(COMPONENT_PYTHON_VERSION_MINOR "${CMAKE_MATCH_3}")
171+ endif()
172+
173+ unset(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME)
174+ if (COMPONENT_PYTHON_VERSION_MINOR)
175+ # Boost >= 1.67
176+ list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
177+ # Debian/Ubuntu (Some versions omit the 2 and/or 3 from the suffix)
178+ list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}${COMPONENT_PYTHON_VERSION_MAJOR}-py${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
179+ list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-py${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
180+ # Gentoo
181+ list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
182+ # RPMs
183+ list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
184+ endif()
185+ if (COMPONENT_PYTHON_VERSION_MAJOR AND NOT COMPONENT_PYTHON_VERSION_MINOR)
186+ # Boost < 1.67
187+ list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}${COMPONENT_PYTHON_VERSION_MAJOR}")
188+ endif()
189+
190 # Consolidate and report component-specific hints.
191+ if(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME)
192+ list(REMOVE_DUPLICATES _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME)
193+ if(Boost_DEBUG)
194+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
195+ "Component-specific library search names for ${COMPONENT_NAME}: "
196+ "${_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME}")
197+ endif()
198+ endif()
199 if(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT)
200 list(REMOVE_DUPLICATES _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT)
201 if(Boost_DEBUG)
202@@ -1649,28 +1733,30 @@ foreach(COMPONENT ${Boost_FIND_COMPONENT
203 # Find RELEASE libraries
204 #
205 unset(_boost_RELEASE_NAMES)
206- foreach(compiler IN LISTS _boost_COMPILER)
207- list(APPEND _boost_RELEASE_NAMES
208- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
209- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} )
210- endforeach()
211- list(APPEND _boost_RELEASE_NAMES
212- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
213- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
214- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
215- if(_boost_STATIC_RUNTIME_WORKAROUND)
216- set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
217+ foreach(component IN LISTS _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME COMPONENT)
218 foreach(compiler IN LISTS _boost_COMPILER)
219 list(APPEND _boost_RELEASE_NAMES
220- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
221- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
222+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
223+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} )
224 endforeach()
225 list(APPEND _boost_RELEASE_NAMES
226- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
227- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
228- endif()
229+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
230+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
231+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component} )
232+ if(_boost_STATIC_RUNTIME_WORKAROUND)
233+ set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
234+ foreach(compiler IN LISTS _boost_COMPILER)
235+ list(APPEND _boost_RELEASE_NAMES
236+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
237+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
238+ endforeach()
239+ list(APPEND _boost_RELEASE_NAMES
240+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
241+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
242+ endif()
243+ endforeach()
244 if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
245- _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
246+ _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
247 endif()
248 if(Boost_DEBUG)
249 message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
250@@ -1699,27 +1785,29 @@ foreach(COMPONENT ${Boost_FIND_COMPONENT
251 # Find DEBUG libraries
252 #
253 unset(_boost_DEBUG_NAMES)
254- foreach(compiler IN LISTS _boost_COMPILER)
255- list(APPEND _boost_DEBUG_NAMES
256- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
257- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} )
258- endforeach()
259- list(APPEND _boost_DEBUG_NAMES
260- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
261- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
262- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}
263- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
264- if(_boost_STATIC_RUNTIME_WORKAROUND)
265- set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
266+ foreach(component IN LISTS _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME COMPONENT)
267 foreach(compiler IN LISTS _boost_COMPILER)
268 list(APPEND _boost_DEBUG_NAMES
269- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
270- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
271+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
272+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} )
273 endforeach()
274 list(APPEND _boost_DEBUG_NAMES
275- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
276- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
277- endif()
278+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
279+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
280+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}
281+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component} )
282+ if(_boost_STATIC_RUNTIME_WORKAROUND)
283+ set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
284+ foreach(compiler IN LISTS _boost_COMPILER)
285+ list(APPEND _boost_DEBUG_NAMES
286+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
287+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
288+ endforeach()
289+ list(APPEND _boost_DEBUG_NAMES
290+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
291+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
292+ endif()
293+ endforeach()
294 if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
295 _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})
296 endif()
diff --git a/meta/recipes-devtools/cmake/cmake/cmake-Prevent-the-detection-of-Qt5.patch b/meta/recipes-devtools/cmake/cmake/cmake-Prevent-the-detection-of-Qt5.patch
deleted file mode 100644
index 88b7e94741..0000000000
--- a/meta/recipes-devtools/cmake/cmake/cmake-Prevent-the-detection-of-Qt5.patch
+++ /dev/null
@@ -1,215 +0,0 @@
1From 875c11dbf87d1258ad7d3697a40d605d503e5673 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Wed, 17 Jan 2018 10:02:14 -0200
4Subject: [PATCH] cmake: Prevent the detection of Qt5
5Organization: O.S. Systems Software LTDA.
6
7CMake doesn't have dependency on qt4/qt5, so these tests usually fail
8but still can cause undeterministic results or build failures (when
9OE_QMAKE_PATH_EXTERNAL_HOST_BINS is undefined or native qmake removed
10while running the test in cmake)
11
12Upstream-Status: Inappropriate [configuration]
13
14Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
15---
16 Source/QtDialog/CMakeLists.txt | 2 +-
17 Tests/CMakeLists.txt | 2 +-
18 Tests/Qt4And5Automoc/CMakeLists.txt | 4 ++--
19 Tests/QtAutoUicInterface/CMakeLists.txt | 2 +-
20 Tests/QtAutogen/CMakeLists.txt | 2 +-
21 Tests/QtAutogen/macosFW/CMakeLists.txt | 2 +-
22 Tests/QtAutogen/mocDepends/CMakeLists.txt | 2 +-
23 Tests/QtAutogenRerun/CMakeLists.txt | 4 ++--
24 Tests/QtAutogenRerun/mocPlugin/CMakeLists.txt | 2 +-
25 Tests/QtAutogenRerun/mocRerun/CMakeLists.txt | 2 +-
26 Tests/QtAutogenRerun/rccDepends/CMakeLists.txt | 2 +-
27 Tests/RunCMake/CMakeLists.txt | 2 +-
28 Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake | 2 +-
29 13 files changed, 15 insertions(+), 15 deletions(-)
30
31diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
32index b38797bca..b5fbfc5fa 100644
33--- a/Source/QtDialog/CMakeLists.txt
34+++ b/Source/QtDialog/CMakeLists.txt
35@@ -6,7 +6,7 @@ if(POLICY CMP0020)
36 cmake_policy(SET CMP0020 NEW) # Drop when CMake >= 2.8.11 required
37 endif()
38 CMake_OPTIONAL_COMPONENT(cmake-gui)
39-find_package(Qt5Widgets QUIET)
40+#find_package(Qt5Widgets QUIET)
41 if (Qt5Widgets_FOUND)
42 include_directories(${Qt5Widgets_INCLUDE_DIRS})
43 add_definitions(${Qt5Widgets_DEFINITONS})
44diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
45index 533788a44..32ef03c55 100644
46--- a/Tests/CMakeLists.txt
47+++ b/Tests/CMakeLists.txt
48@@ -1260,7 +1260,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
49 set(CMake_TEST_Qt5 1)
50 endif()
51 if(CMake_TEST_Qt5)
52- find_package(Qt5Widgets QUIET NO_MODULE)
53+ #find_package(Qt5Widgets QUIET NO_MODULE)
54 endif()
55 if(CMake_TEST_Qt5 AND Qt5Widgets_FOUND)
56 add_test(NAME Qt5Autogen COMMAND ${CMAKE_CTEST_COMMAND}
57diff --git a/Tests/Qt4And5Automoc/CMakeLists.txt b/Tests/Qt4And5Automoc/CMakeLists.txt
58index ad74961d9..a9dd74b15 100644
59--- a/Tests/Qt4And5Automoc/CMakeLists.txt
60+++ b/Tests/Qt4And5Automoc/CMakeLists.txt
61@@ -3,11 +3,11 @@ cmake_minimum_required(VERSION 2.8.12)
62 project(Qt4And5Automoc)
63
64 if (QT_REVERSE_FIND_ORDER)
65- find_package(Qt5Core REQUIRED)
66+ #find_package(Qt5Core REQUIRED)
67 find_package(Qt4 REQUIRED)
68 else()
69 find_package(Qt4 REQUIRED)
70- find_package(Qt5Core REQUIRED)
71+ #find_package(Qt5Core REQUIRED)
72 endif()
73
74 set(CMAKE_AUTOMOC ON)
75diff --git a/Tests/QtAutoUicInterface/CMakeLists.txt b/Tests/QtAutoUicInterface/CMakeLists.txt
76index a5c2d99b2..2d640e4a3 100644
77--- a/Tests/QtAutoUicInterface/CMakeLists.txt
78+++ b/Tests/QtAutoUicInterface/CMakeLists.txt
79@@ -14,7 +14,7 @@ else()
80 if (NOT QT_TEST_VERSION STREQUAL 5)
81 message(SEND_ERROR "Invalid Qt version specified.")
82 endif()
83- find_package(Qt5Widgets REQUIRED)
84+ #find_package(Qt5Widgets REQUIRED)
85
86 set(QT_CORE_TARGET Qt5::Core)
87 set(QT_GUI_TARGET Qt5::Widgets)
88diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
89index dff9d0c66..c6e8fc3f5 100644
90--- a/Tests/QtAutogen/CMakeLists.txt
91+++ b/Tests/QtAutogen/CMakeLists.txt
92@@ -23,7 +23,7 @@ else()
93 if (NOT QT_TEST_VERSION STREQUAL 5)
94 message(SEND_ERROR "Invalid Qt version specified.")
95 endif()
96- find_package(Qt5Widgets REQUIRED)
97+ #find_package(Qt5Widgets REQUIRED)
98
99 set(QT_QTCORE_TARGET Qt5::Core)
100
101diff --git a/Tests/QtAutogen/macosFW/CMakeLists.txt b/Tests/QtAutogen/macosFW/CMakeLists.txt
102index 114d9bac0..157fe0aaa 100644
103--- a/Tests/QtAutogen/macosFW/CMakeLists.txt
104+++ b/Tests/QtAutogen/macosFW/CMakeLists.txt
105@@ -1,7 +1,7 @@
106 cmake_minimum_required(VERSION 3.8)
107 project(macos-fw-test)
108
109-find_package(Qt5Test REQUIRED)
110+#find_package(Qt5Test REQUIRED)
111
112 set(CMAKE_CXX_STANDARD 11)
113 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin)
114diff --git a/Tests/QtAutogen/mocDepends/CMakeLists.txt b/Tests/QtAutogen/mocDepends/CMakeLists.txt
115index 8217b8dbf..86bb7bc7f 100644
116--- a/Tests/QtAutogen/mocDepends/CMakeLists.txt
117+++ b/Tests/QtAutogen/mocDepends/CMakeLists.txt
118@@ -10,7 +10,7 @@ else()
119 message(SEND_ERROR "Invalid Qt version specified.")
120 endif()
121
122- find_package(Qt5Core REQUIRED)
123+ #find_package(Qt5Core REQUIRED)
124 set(QT_CORE_TARGET Qt5::Core)
125 endif()
126
127diff --git a/Tests/QtAutogenRerun/CMakeLists.txt b/Tests/QtAutogenRerun/CMakeLists.txt
128index e72c1912e..d7e6884ce 100644
129--- a/Tests/QtAutogenRerun/CMakeLists.txt
130+++ b/Tests/QtAutogenRerun/CMakeLists.txt
131@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.9)
132 cmake_policy(SET CMP0071 NEW)
133 project(QtAutogenRerun)
134
135-# Tell find_package(Qt5) where to find Qt.
136+# Tell #find_package(Qt5) where to find Qt.
137 if(QT_QMAKE_EXECUTABLE)
138 get_filename_component(Qt_BIN_DIR "${QT_QMAKE_EXECUTABLE}" PATH)
139 get_filename_component(Qt_PREFIX_DIR "${Qt_BIN_DIR}" PATH)
140@@ -23,7 +23,7 @@ else()
141 if (NOT QT_TEST_VERSION STREQUAL 5)
142 message(SEND_ERROR "Invalid Qt version specified.")
143 endif()
144- find_package(Qt5Widgets REQUIRED)
145+ #find_package(Qt5Widgets REQUIRED)
146
147 set(QT_QTCORE_TARGET Qt5::Core)
148
149diff --git a/Tests/QtAutogenRerun/mocPlugin/CMakeLists.txt b/Tests/QtAutogenRerun/mocPlugin/CMakeLists.txt
150index b7cc5e9ff..e1d109953 100644
151--- a/Tests/QtAutogenRerun/mocPlugin/CMakeLists.txt
152+++ b/Tests/QtAutogenRerun/mocPlugin/CMakeLists.txt
153@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC_DEPEND_FILTERS
154 if (NOT QT_TEST_VERSION STREQUAL 5)
155 message(SEND_ERROR "Invalid Qt version specified.")
156 endif()
157-find_package(Qt5Widgets REQUIRED)
158+#find_package(Qt5Widgets REQUIRED)
159
160 if(Qt5_POSITION_INDEPENDENT_CODE AND CMAKE_CXX_COMPILE_OPTIONS_PIC)
161 add_definitions(${CMAKE_CXX_COMPILE_OPTIONS_PIC})
162diff --git a/Tests/QtAutogenRerun/mocRerun/CMakeLists.txt b/Tests/QtAutogenRerun/mocRerun/CMakeLists.txt
163index bafd9cf48..43ec933d2 100644
164--- a/Tests/QtAutogenRerun/mocRerun/CMakeLists.txt
165+++ b/Tests/QtAutogenRerun/mocRerun/CMakeLists.txt
166@@ -10,7 +10,7 @@ else()
167 message(SEND_ERROR "Invalid Qt version specified.")
168 endif()
169
170- find_package(Qt5Core REQUIRED)
171+ #find_package(Qt5Core REQUIRED)
172 set(QT_CORE_TARGET Qt5::Core)
173 endif()
174
175diff --git a/Tests/QtAutogenRerun/rccDepends/CMakeLists.txt b/Tests/QtAutogenRerun/rccDepends/CMakeLists.txt
176index 291592e7d..40cd52868 100644
177--- a/Tests/QtAutogenRerun/rccDepends/CMakeLists.txt
178+++ b/Tests/QtAutogenRerun/rccDepends/CMakeLists.txt
179@@ -9,7 +9,7 @@ else()
180 message(SEND_ERROR "Invalid Qt version specified.")
181 endif()
182
183- find_package(Qt5Core REQUIRED)
184+ #find_package(Qt5Core REQUIRED)
185 set(QT_CORE_TARGET Qt5::Core)
186 endif()
187
188diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
189index 29325ff0a..d30d01e78 100644
190--- a/Tests/RunCMake/CMakeLists.txt
191+++ b/Tests/RunCMake/CMakeLists.txt
192@@ -274,7 +274,7 @@ add_RunCMake_test(configure_file)
193 add_RunCMake_test(CTestTimeoutAfterMatch)
194
195 find_package(Qt4 QUIET)
196-find_package(Qt5Core QUIET)
197+#find_package(Qt5Core QUIET)
198 if (QT4_FOUND AND Qt5Core_FOUND AND NOT Qt5Core_VERSION VERSION_LESS 5.1.0)
199 add_RunCMake_test(IncompatibleQt)
200 endif()
201diff --git a/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake b/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake
202index 4fccdc418..b76e1e531 100644
203--- a/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake
204+++ b/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake
205@@ -1,6 +1,6 @@
206
207 find_package(Qt4 REQUIRED)
208-find_package(Qt5Core REQUIRED)
209+#find_package(Qt5Core REQUIRED)
210
211 add_executable(mainexe main.cpp)
212 target_link_libraries(mainexe Qt4::QtCore Qt5::Core)
213--
2142.15.1
215
diff --git a/meta/recipes-devtools/cmake/cmake_3.10.3.bb b/meta/recipes-devtools/cmake/cmake_3.11.4.bb
index 3f8fd7a997..3f8fd7a997 100644
--- a/meta/recipes-devtools/cmake/cmake_3.10.3.bb
+++ b/meta/recipes-devtools/cmake/cmake_3.11.4.bb
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-12 11:56:22 +0000