diff options
Diffstat (limited to 'meta/recipes-devtools/cmake')
-rw-r--r-- | meta/recipes-devtools/cmake/cmake-native_3.29.3.bb (renamed from meta/recipes-devtools/cmake/cmake-native_3.28.3.bb) | 6 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake.inc | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch | 9 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch | 9 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake_3.29.3.bb (renamed from meta/recipes-devtools/cmake/cmake_3.28.3.bb) | 8 |
5 files changed, 16 insertions, 20 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.28.3.bb b/meta/recipes-devtools/cmake/cmake-native_3.29.3.bb index 546d117156..ddc41f289e 100644 --- a/meta/recipes-devtools/cmake/cmake-native_3.28.3.bb +++ b/meta/recipes-devtools/cmake/cmake-native_3.29.3.bb | |||
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM:append = " \ | |||
16 | file://Utilities/cmexpat/COPYING;md5=9e2ce3b3c4c0f2670883a23bbd7c37a9 \ | 16 | file://Utilities/cmexpat/COPYING;md5=9e2ce3b3c4c0f2670883a23bbd7c37a9 \ |
17 | file://Utilities/cmlibrhash/COPYING;md5=a8c2a557a5c53b1c12cddbee98c099af \ | 17 | file://Utilities/cmlibrhash/COPYING;md5=a8c2a557a5c53b1c12cddbee98c099af \ |
18 | file://Utilities/cmlibuv/LICENSE;md5=ad93ca1fffe931537fcf64f6fcce084d \ | 18 | file://Utilities/cmlibuv/LICENSE;md5=ad93ca1fffe931537fcf64f6fcce084d \ |
19 | file://Utilities/cmcurl/COPYING;md5=db8448a1e43eb2125f7740fc397db1f6 \ | 19 | file://Utilities/cmcurl/COPYING;md5=eed2e5088e1ac619c9a1c747da291d75 \ |
20 | " | 20 | " |
21 | 21 | ||
22 | B = "${WORKDIR}/build" | 22 | B = "${WORKDIR}/build" |
@@ -54,9 +54,9 @@ do_install() { | |||
54 | # The following codes are here because eSDK needs to provide compatibilty | 54 | # The following codes are here because eSDK needs to provide compatibilty |
55 | # for SDK. That is, eSDK could also be used like traditional SDK. | 55 | # for SDK. That is, eSDK could also be used like traditional SDK. |
56 | mkdir -p ${D}${datadir}/cmake | 56 | mkdir -p ${D}${datadir}/cmake |
57 | install -m 644 ${WORKDIR}/OEToolchainConfig.cmake ${D}${datadir}/cmake/ | 57 | install -m 644 ${UNPACKDIR}/OEToolchainConfig.cmake ${D}${datadir}/cmake/ |
58 | mkdir -p ${D}${base_prefix}/environment-setup.d | 58 | mkdir -p ${D}${base_prefix}/environment-setup.d |
59 | install -m 644 ${WORKDIR}/environment.d-cmake.sh ${D}${base_prefix}/environment-setup.d/cmake.sh | 59 | install -m 644 ${UNPACKDIR}/environment.d-cmake.sh ${D}${base_prefix}/environment-setup.d/cmake.sh |
60 | 60 | ||
61 | # Help docs create tons of files in the native sysroot and aren't needed there | 61 | # Help docs create tons of files in the native sysroot and aren't needed there |
62 | rm -rf ${D}${datadir}/cmake-*/Help | 62 | rm -rf ${D}${datadir}/cmake-*/Help |
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index ab9f459c05..1155c1bbe0 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc | |||
@@ -10,7 +10,7 @@ HOMEPAGE = "http://www.cmake.org/" | |||
10 | BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" | 10 | BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" |
11 | SECTION = "console/utils" | 11 | SECTION = "console/utils" |
12 | LICENSE = "BSD-3-Clause" | 12 | LICENSE = "BSD-3-Clause" |
13 | LIC_FILES_CHKSUM = "file://Copyright.txt;md5=9d3d12c5f3b4c1f83650adcc65b59c06 \ | 13 | LIC_FILES_CHKSUM = "file://Copyright.txt;md5=718f05155941b33862726348d3cd46ce \ |
14 | file://Source/cmake.h;beginline=1;endline=2;md5=a5f70e1fef8614734eae0d62b4f5891b \ | 14 | file://Source/cmake.h;beginline=1;endline=2;md5=a5f70e1fef8614734eae0d62b4f5891b \ |
15 | " | 15 | " |
16 | 16 | ||
@@ -19,7 +19,7 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" | |||
19 | SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ | 19 | SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ |
20 | " | 20 | " |
21 | 21 | ||
22 | SRC_URI[sha256sum] = "72b7570e5c8593de6ac4ab433b73eab18c5fb328880460c86ce32608141ad5c1" | 22 | SRC_URI[sha256sum] = "252aee1448d49caa04954fd5e27d189dd51570557313e7b281636716a238bccb" |
23 | 23 | ||
24 | UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" | 24 | UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" |
25 | 25 | ||
diff --git a/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch b/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch index b2933d88be..b7ec3e7bac 100644 --- a/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch +++ b/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d33d8a5e9f3b25a80d47b72b1a8a6624a85563c1 Mon Sep 17 00:00:00 2001 | 1 | From 946011cbfd686fe6bd2cec94494f6b0c4394bb6c Mon Sep 17 00:00:00 2001 |
2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | Date: Wed, 28 Dec 2022 17:51:27 +0800 | 3 | Date: Wed, 28 Dec 2022 17:51:27 +0800 |
4 | Subject: [PATCH] CMakeLists.txt: disable USE_NGHTTP2 | 4 | Subject: [PATCH] CMakeLists.txt: disable USE_NGHTTP2 |
@@ -18,10 +18,10 @@ Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | |||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | 18 | 1 file changed, 1 insertion(+), 1 deletion(-) |
19 | 19 | ||
20 | diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt | 20 | diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt |
21 | index 9387247366..d3de01f4e8 100644 | 21 | index 3dd24f1e..4a0f6773 100644 |
22 | --- a/Utilities/cmcurl/CMakeLists.txt | 22 | --- a/Utilities/cmcurl/CMakeLists.txt |
23 | +++ b/Utilities/cmcurl/CMakeLists.txt | 23 | +++ b/Utilities/cmcurl/CMakeLists.txt |
24 | @@ -88,7 +88,7 @@ set(HTTP_ONLY OFF CACHE INTERNAL "Curl is not http-only") | 24 | @@ -91,7 +91,7 @@ set(HTTP_ONLY OFF CACHE INTERNAL "Curl is not http-only") |
25 | set(PICKY_COMPILER OFF CACHE INTERNAL "Enable picky compiler options") | 25 | set(PICKY_COMPILER OFF CACHE INTERNAL "Enable picky compiler options") |
26 | set(SHARE_LIB_OBJECT OFF) | 26 | set(SHARE_LIB_OBJECT OFF) |
27 | set(USE_LIBIDN2 ON) | 27 | set(USE_LIBIDN2 ON) |
@@ -30,6 +30,3 @@ index 9387247366..d3de01f4e8 100644 | |||
30 | set(USE_NGTCP2 OFF) | 30 | set(USE_NGTCP2 OFF) |
31 | set(USE_QUICHE OFF) | 31 | set(USE_QUICHE OFF) |
32 | set(USE_WIN32_IDN OFF) | 32 | set(USE_WIN32_IDN OFF) |
33 | -- | ||
34 | 2.43.0 | ||
35 | |||
diff --git a/meta/recipes-devtools/cmake/cmake/0005-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 d6f7308fe0..af164084d0 100644 --- a/meta/recipes-devtools/cmake/cmake/0005-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,4 +1,4 @@ | |||
1 | From fd9a04c1434e12f21c043385e306e0b52d38d749 Mon Sep 17 00:00:00 2001 | 1 | From 2d3f6933f78d393514a48f8222ac8c3c39cb5fc7 Mon Sep 17 00:00:00 2001 |
2 | From: Otavio Salvador <otavio@ossystems.com.br> | 2 | From: Otavio Salvador <otavio@ossystems.com.br> |
3 | Date: Thu, 5 Jul 2018 10:28:04 -0300 | 3 | Date: Thu, 5 Jul 2018 10:28:04 -0300 |
4 | Subject: [PATCH] Disable use of ext2fs/ext2_fs.h by cmake's internal | 4 | Subject: [PATCH] Disable use of ext2fs/ext2_fs.h by cmake's internal |
@@ -13,16 +13,15 @@ Upstream-Status: Inappropriate [config] | |||
13 | 13 | ||
14 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | 14 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> |
15 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | 15 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> |
16 | |||
17 | --- | 16 | --- |
18 | Utilities/cmlibarchive/CMakeLists.txt | 8 ++------ | 17 | Utilities/cmlibarchive/CMakeLists.txt | 8 ++------ |
19 | 1 file changed, 2 insertions(+), 6 deletions(-) | 18 | 1 file changed, 2 insertions(+), 6 deletions(-) |
20 | 19 | ||
21 | diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt | 20 | diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt |
22 | index bfcaf30..2960683 100644 | 21 | index e47184b7..e4964c32 100644 |
23 | --- a/Utilities/cmlibarchive/CMakeLists.txt | 22 | --- a/Utilities/cmlibarchive/CMakeLists.txt |
24 | +++ b/Utilities/cmlibarchive/CMakeLists.txt | 23 | +++ b/Utilities/cmlibarchive/CMakeLists.txt |
25 | @@ -682,12 +682,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H) | 24 | @@ -721,12 +721,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H) |
26 | LA_CHECK_INCLUDE_FILE("direct.h" HAVE_DIRECT_H) | 25 | LA_CHECK_INCLUDE_FILE("direct.h" HAVE_DIRECT_H) |
27 | LA_CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H) | 26 | LA_CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H) |
28 | LA_CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H) | 27 | LA_CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H) |
@@ -35,5 +34,5 @@ index bfcaf30..2960683 100644 | |||
35 | +SET(HAVE_EXT2FS_EXT2_FS_H 0) | 34 | +SET(HAVE_EXT2FS_EXT2_FS_H 0) |
36 | +SET(HAVE_WORKING_EXT2_IOC_GETFLAGS 0) | 35 | +SET(HAVE_WORKING_EXT2_IOC_GETFLAGS 0) |
37 | LA_CHECK_INCLUDE_FILE("fcntl.h" HAVE_FCNTL_H) | 36 | LA_CHECK_INCLUDE_FILE("fcntl.h" HAVE_FCNTL_H) |
37 | LA_CHECK_INCLUDE_FILE("fnmatch.h" HAVE_FNMATCH_H) | ||
38 | LA_CHECK_INCLUDE_FILE("grp.h" HAVE_GRP_H) | 38 | LA_CHECK_INCLUDE_FILE("grp.h" HAVE_GRP_H) |
39 | LA_CHECK_INCLUDE_FILE("io.h" HAVE_IO_H) | ||
diff --git a/meta/recipes-devtools/cmake/cmake_3.28.3.bb b/meta/recipes-devtools/cmake/cmake_3.29.3.bb index 6a9a3266df..9146fa8c0f 100644 --- a/meta/recipes-devtools/cmake/cmake_3.28.3.bb +++ b/meta/recipes-devtools/cmake/cmake_3.29.3.bb | |||
@@ -48,15 +48,15 @@ EXTRA_OECMAKE=" \ | |||
48 | 48 | ||
49 | do_install:append:class-nativesdk() { | 49 | do_install:append:class-nativesdk() { |
50 | mkdir -p ${D}${datadir}/cmake | 50 | mkdir -p ${D}${datadir}/cmake |
51 | install -m 644 ${WORKDIR}/OEToolchainConfig.cmake ${D}${datadir}/cmake/ | 51 | install -m 644 ${UNPACKDIR}/OEToolchainConfig.cmake ${D}${datadir}/cmake/ |
52 | 52 | ||
53 | mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d | 53 | mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d |
54 | install -m 644 ${WORKDIR}/environment.d-cmake.sh ${D}${SDKPATHNATIVE}/environment-setup.d/cmake.sh | 54 | install -m 644 ${UNPACKDIR}/environment.d-cmake.sh ${D}${SDKPATHNATIVE}/environment-setup.d/cmake.sh |
55 | 55 | ||
56 | # install cmake-setup.py to create arch-specific toolchain cmake file from template | 56 | # install cmake-setup.py to create arch-specific toolchain cmake file from template |
57 | install -m 0644 ${WORKDIR}/SDKToolchainConfig.cmake.template ${D}${datadir}/cmake/ | 57 | install -m 0644 ${UNPACKDIR}/SDKToolchainConfig.cmake.template ${D}${datadir}/cmake/ |
58 | install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d | 58 | install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d |
59 | install -m 0755 ${WORKDIR}/cmake-setup.py ${D}${SDKPATHNATIVE}/post-relocate-setup.d/ | 59 | install -m 0755 ${UNPACKDIR}/cmake-setup.py ${D}${SDKPATHNATIVE}/post-relocate-setup.d/ |
60 | } | 60 | } |
61 | 61 | ||
62 | FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}" | 62 | FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}" |