summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/cmake/cmake-native_3.12.1.bb (renamed from meta/recipes-devtools/cmake/cmake-native_3.11.4.bb)4
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc12
-rw-r--r--meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch14
-rw-r--r--meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch (renamed from meta/recipes-devtools/cmake/cmake/0001-cmake-Prevent-the-detection-of-Qt5.patch)12
-rw-r--r--meta/recipes-devtools/cmake/cmake/0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch (renamed from meta/recipes-devtools/cmake/cmake/0002-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch)8
-rw-r--r--meta/recipes-devtools/cmake/cmake/0004-Fail-silently-if-system-Qt-installation-is-broken.patch (renamed from meta/recipes-devtools/cmake/cmake/0003-Fail-silently-if-system-Qt-installation-is-broken.patch)8
-rw-r--r--meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch (renamed from meta/recipes-devtools/cmake/cmake/0004-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch)4
-rw-r--r--meta/recipes-devtools/cmake/cmake_3.12.1.bb (renamed from meta/recipes-devtools/cmake/cmake_3.11.4.bb)0
8 files changed, 32 insertions, 30 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.11.4.bb b/meta/recipes-devtools/cmake/cmake-native_3.12.1.bb
index f55c519c8c..9a1390f96d 100644
--- a/meta/recipes-devtools/cmake/cmake-native_3.11.4.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_3.12.1.bb
@@ -3,10 +3,10 @@ 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 += "file://0004-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch \ 6SRC_URI += "file://OEToolchainConfig.cmake \
7 file://OEToolchainConfig.cmake \
8 file://environment.d-cmake.sh \ 7 file://environment.d-cmake.sh \
9 file://0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch \ 8 file://0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch \
9 file://0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch \
10 " 10 "
11 11
12 12
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index 436363e4e3..4c30162c19 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -6,19 +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=891b81f415fb25fbad03e41f87fd5dfb \ 9LIC_FILES_CHKSUM = "file://Copyright.txt;md5=f61f5f859bc5ddba2b050eb10335e013 \
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://0001-cmake-Prevent-the-detection-of-Qt5.patch \ 16 file://0002-cmake-Prevent-the-detection-of-Qt5.patch \
17 file://0002-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch \ 17 file://0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch \
18 file://0003-Fail-silently-if-system-Qt-installation-is-broken.patch \ 18 file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \
19" 19"
20 20
21SRC_URI[md5sum] = "72e168b3bad2f9c34dcebbad7af56ff0" 21SRC_URI[md5sum] = "10109246a51102bfda45ff3935275fbf"
22SRC_URI[sha256sum] = "8f864e9f78917de3e1483e256270daabc4a321741592c5b36af028e72bff87f5" 22SRC_URI[sha256sum] = "c53d5c2ce81d7a957ee83e3e635c8cda5dfe20c9d501a4828ee28e1615e57ab2"
23 23
24UPSTREAM_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-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch b/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch
index a2332879cf..f690720870 100644
--- a/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch
+++ b/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch
@@ -1,8 +1,9 @@
1From a42cfebcd6c684cccf8ad33e5bd5130f7cdba135 Mon Sep 17 00:00:00 2001 1From 71085723f8028b3e1c4029fc1abe1243ac49ffc6 Mon Sep 17 00:00:00 2001
2From: Cody P Schafer <dev@codyps.com> 2From: Cody P Schafer <dev@codyps.com>
3Date: Thu, 27 Apr 2017 11:35:05 -0400 3Date: Thu, 27 Apr 2017 11:35:05 -0400
4Subject: [PATCH] CMakeDetermineSystem: use oe environment vars to load default 4Subject: [PATCH 1/5] CMakeDetermineSystem: use oe environment vars to load
5 toolchain file in sdk 5 default toolchain file in sdk
6Organization: O.S. Systems Software LTDA.
6 7
7Passing the toolchain by: 8Passing the toolchain by:
8 9
@@ -18,15 +19,16 @@ because '-D' options are cache entries themselves.
18 19
19Upstream-Status: Inappropriate [oe-core specific] 20Upstream-Status: Inappropriate [oe-core specific]
20Signed-off-by: Cody P Schafer <dev@codyps.com> 21Signed-off-by: Cody P Schafer <dev@codyps.com>
22Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
21--- 23---
22 Modules/CMakeDetermineSystem.cmake | 7 +++++++ 24 Modules/CMakeDetermineSystem.cmake | 7 +++++++
23 1 file changed, 7 insertions(+) 25 1 file changed, 7 insertions(+)
24 26
25diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake 27diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake
26index f34ec5d61..bcac3ef16 100644 28index 600d5580e..32d7f1945 100644
27--- a/Modules/CMakeDetermineSystem.cmake 29--- a/Modules/CMakeDetermineSystem.cmake
28+++ b/Modules/CMakeDetermineSystem.cmake 30+++ b/Modules/CMakeDetermineSystem.cmake
29@@ -74,6 +74,13 @@ else() 31@@ -82,6 +82,13 @@ else()
30 endif() 32 endif()
31 endif() 33 endif()
32 34
@@ -41,5 +43,5 @@ index f34ec5d61..bcac3ef16 100644
41 # in this case read the toolchain file and keep the CMAKE_HOST_SYSTEM_* 43 # in this case read the toolchain file and keep the CMAKE_HOST_SYSTEM_*
42 # variables around so they can be used in CMakeLists.txt. 44 # variables around so they can be used in CMakeLists.txt.
43-- 45--
442.12.2 462.18.0
45 47
diff --git a/meta/recipes-devtools/cmake/cmake/0001-cmake-Prevent-the-detection-of-Qt5.patch b/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch
index b4976e918b..6f788ada00 100644
--- a/meta/recipes-devtools/cmake/cmake/0001-cmake-Prevent-the-detection-of-Qt5.patch
+++ b/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch
@@ -1,7 +1,7 @@
1From 0f60f3922bc85994fcde5079ce5a52f9b51f6915 Mon Sep 17 00:00:00 2001 1From 7a1f4e724f9c68498f401244c2938e784a2e6fbd Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br> 2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Wed, 17 Jan 2018 10:02:14 -0200 3Date: Wed, 17 Jan 2018 10:02:14 -0200
4Subject: [PATCH 1/4] cmake: Prevent the detection of Qt5 4Subject: [PATCH 2/5] cmake: Prevent the detection of Qt5
5Organization: O.S. Systems Software LTDA. 5Organization: O.S. Systems Software LTDA.
6 6
7CMake doesn't have dependency on qt4/qt5, so these tests usually fail 7CMake doesn't have dependency on qt4/qt5, so these tests usually fail
@@ -36,10 +36,10 @@ index 330b74729..e7709dee6 100644
36 include_directories(${Qt5Widgets_INCLUDE_DIRS}) 36 include_directories(${Qt5Widgets_INCLUDE_DIRS})
37 add_definitions(${Qt5Widgets_DEFINITONS}) 37 add_definitions(${Qt5Widgets_DEFINITONS})
38diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt 38diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
39index 08bfebe0e..dd4d7f4fb 100644 39index b8b724ed8..63f6bb6d2 100644
40--- a/Tests/CMakeLists.txt 40--- a/Tests/CMakeLists.txt
41+++ b/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 42@@ -1322,7 +1322,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
43 set(CMake_TEST_Qt5 1) 43 set(CMake_TEST_Qt5 1)
44 endif() 44 endif()
45 if(CMake_TEST_Qt5) 45 if(CMake_TEST_Qt5)
@@ -93,10 +93,10 @@ index 26d201926..e48e1c8de 100644
93 set(CMAKE_CXX_STANDARD 11) 93 set(CMAKE_CXX_STANDARD 11)
94 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin) 94 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin)
95diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt 95diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
96index c52f44ece..d39cd8828 100644 96index 637c5c2cb..c0376effc 100644
97--- a/Tests/RunCMake/CMakeLists.txt 97--- a/Tests/RunCMake/CMakeLists.txt
98+++ b/Tests/RunCMake/CMakeLists.txt 98+++ b/Tests/RunCMake/CMakeLists.txt
99@@ -285,7 +285,7 @@ add_RunCMake_test(configure_file) 99@@ -291,7 +291,7 @@ add_RunCMake_test(configure_file)
100 add_RunCMake_test(CTestTimeoutAfterMatch) 100 add_RunCMake_test(CTestTimeoutAfterMatch)
101 101
102 find_package(Qt4 QUIET) 102 find_package(Qt4 QUIET)
diff --git a/meta/recipes-devtools/cmake/cmake/0002-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch b/meta/recipes-devtools/cmake/cmake/0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch
index acbe961c64..55cf47188a 100644
--- a/meta/recipes-devtools/cmake/cmake/0002-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch
+++ b/meta/recipes-devtools/cmake/cmake/0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch
@@ -1,7 +1,7 @@
1From 5fc9c33a7d6781008877b19dfdf0a526a50524f2 Mon Sep 17 00:00:00 2001 1From c783ceeef485c23e13c3d9f0418719cb0e0b86ee 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 2/4] cmake: support OpenEmbedded Qt4 tool binary names 4Subject: [PATCH 3/5] cmake: support OpenEmbedded Qt4 tool binary names
5Organization: O.S. Systems Software LTDA. 5Organization: O.S. Systems Software LTDA.
6 6
7The 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
@@ -25,7 +25,7 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
25 1 file changed, 5 insertions(+), 5 deletions(-) 25 1 file changed, 5 insertions(+), 5 deletions(-)
26 26
27diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake 27diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
28index 5a7eadb96..d48a5bfd1 100644 28index 847a798af..7ad981879 100644
29--- a/Modules/FindQt4.cmake 29--- a/Modules/FindQt4.cmake
30+++ b/Modules/FindQt4.cmake 30+++ b/Modules/FindQt4.cmake
31@@ -517,7 +517,7 @@ endfunction() 31@@ -517,7 +517,7 @@ endfunction()
@@ -37,7 +37,7 @@ index 5a7eadb96..d48a5bfd1 100644
37 _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION) 37 _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION)
38 38
39 if (QT_QMAKE_EXECUTABLE AND 39 if (QT_QMAKE_EXECUTABLE AND
40@@ -1143,12 +1143,12 @@ if (QT_QMAKE_EXECUTABLE AND 40@@ -1135,12 +1135,12 @@ if (QT_QMAKE_EXECUTABLE AND
41 _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)
42 _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)
43 _find_qt4_program(QT_UIC3_EXECUTABLE Qt4::uic3 uic3) 43 _find_qt4_program(QT_UIC3_EXECUTABLE Qt4::uic3 uic3)
diff --git a/meta/recipes-devtools/cmake/cmake/0003-Fail-silently-if-system-Qt-installation-is-broken.patch b/meta/recipes-devtools/cmake/cmake/0004-Fail-silently-if-system-Qt-installation-is-broken.patch
index 301da0221d..a59c680454 100644
--- a/meta/recipes-devtools/cmake/cmake/0003-Fail-silently-if-system-Qt-installation-is-broken.patch
+++ b/meta/recipes-devtools/cmake/cmake/0004-Fail-silently-if-system-Qt-installation-is-broken.patch
@@ -1,7 +1,7 @@
1From b30da754a32213b5a0b3698f88e1302e5b18518b Mon Sep 17 00:00:00 2001 1From 9516fc4260f701c6d9db0c341bb36480362e1747 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br> 2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Thu, 5 Jul 2018 10:26:48 -0300 3Date: Thu, 5 Jul 2018 10:26:48 -0300
4Subject: [PATCH 3/4] Fail silently if system Qt installation is broken 4Subject: [PATCH 4/5] Fail silently if system Qt installation is broken
5Organization: O.S. Systems Software LTDA. 5Organization: O.S. Systems Software LTDA.
6 6
7Fixes 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
@@ -28,10 +28,10 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
28 1 file changed, 20 insertions(+), 19 deletions(-) 28 1 file changed, 20 insertions(+), 19 deletions(-)
29 29
30diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake 30diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
31index d48a5bfd1..e6f22fe9b 100644 31index 7ad981879..8b6f43cda 100644
32--- a/Modules/FindQt4.cmake 32--- a/Modules/FindQt4.cmake
33+++ b/Modules/FindQt4.cmake 33+++ b/Modules/FindQt4.cmake
34@@ -995,25 +995,26 @@ if (QT_QMAKE_EXECUTABLE AND 34@@ -987,25 +987,26 @@ if (QT_QMAKE_EXECUTABLE AND
35 endif() 35 endif()
36 endmacro() 36 endmacro()
37 37
diff --git a/meta/recipes-devtools/cmake/cmake/0004-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch b/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch
index 91dea4cbba..23ce8e9e4a 100644
--- a/meta/recipes-devtools/cmake/cmake/0004-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch
+++ b/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch
@@ -1,7 +1,7 @@
1From d9aa3f7c075dbd0db386995a44a2240ecdbb2c56 Mon Sep 17 00:00:00 2001 1From 0df8d46d14c371f21c327966a553c4c187a8acfe Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br> 2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Thu, 5 Jul 2018 10:28:04 -0300 3Date: Thu, 5 Jul 2018 10:28:04 -0300
4Subject: [PATCH 4/4] Disable use of ext2fs/ext2_fs.h by cmake's internal 4Subject: [PATCH 5/5] Disable use of ext2fs/ext2_fs.h by cmake's internal
5 libarchive copy 5 libarchive copy
6Organization: O.S. Systems Software LTDA. 6Organization: O.S. Systems Software LTDA.
7 7
diff --git a/meta/recipes-devtools/cmake/cmake_3.11.4.bb b/meta/recipes-devtools/cmake/cmake_3.12.1.bb
index e0457677e8..e0457677e8 100644
--- a/meta/recipes-devtools/cmake/cmake_3.11.4.bb
+++ b/meta/recipes-devtools/cmake/cmake_3.12.1.bb