>From a283fa07882ff32d4ad0d9aaa7ec99b68d3731e5 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Wed, 1 Jun 2022 07:14:08 +0000 Subject: [PATCH] cmake: upgrade 3.23.1 -> 3.23.2 --- meta/recipes-devtools/cmake/cmake.inc | 2 +- ...stem-use-oe-environment-vars-to-load.patch | 2 +- .../cmake/cmake/OEToolchainConfig.cmake | 24 -------------- .../cmake/SDKToolchainConfig.cmake.template | 31 ----------------- .../cmake/cmake/cmake-setup.py | 33 ------------------- .../cmake/cmake/environment.d-cmake.sh | 2 -- .../{cmake_3.23.1.bb => cmake_3.23.2.bb} | 13 +++----- 7 files changed, 7 insertions(+), 100 deletions(-) delete mode 100644 meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake delete mode 100644 meta/recipes-devtools/cmake/cmake/SDKToolchainConfig.cmake.template delete mode 100755 meta/recipes-devtools/cmake/cmake/cmake-setup.py delete mode 100644 meta/recipes-devtools/cmake/cmake/environment.d-cmake.sh rename meta/recipes-devtools/cmake/{cmake_3.23.1.bb => cmake_3.23.2.bb} (86%) diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 934d577acf..4a6884e871 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -21,7 +21,7 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ " -SRC_URI[sha256sum] = "33fd10a8ec687a4d0d5b42473f10459bb92b3ae7def2b745dc10b192760869f3" +SRC_URI[sha256sum] = "f316b40053466f9a416adf981efda41b160ca859e97f6a484b447ea299ff26aa" UPSTREAM_CHECK_REGEX = "cmake-(?P\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 9a2287f517..2f03ed31c9 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,4 +1,4 @@ -From 89f6c846f02ad6d30b9ebb7eaaaa4fb6f9cec054 Mon Sep 17 00:00:00 2001 +From a2c8493986f7f01593d9b37dac259ddf3acbcf9c Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Thu, 27 Apr 2017 11:35:05 -0400 Subject: [PATCH] CMakeDetermineSystem: use oe environment vars to load default diff --git a/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake b/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake deleted file mode 100644 index 86446c3ace..0000000000 --- a/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake +++ /dev/null @@ -1,24 +0,0 @@ -set( CMAKE_SYSTEM_NAME Linux ) -set( CMAKE_C_FLAGS $ENV{CFLAGS} CACHE STRING "" FORCE ) -set( CMAKE_CXX_FLAGS $ENV{CXXFLAGS} CACHE STRING "" FORCE ) -set( CMAKE_ASM_FLAGS ${CMAKE_C_FLAGS} CACHE STRING "" FORCE ) -set( CMAKE_SYSROOT $ENV{OECORE_TARGET_SYSROOT} ) - -set( CMAKE_FIND_ROOT_PATH $ENV{OECORE_TARGET_SYSROOT} ) -set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER ) -set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) -set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY ) -set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY ) - -set(CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX "$ENV{OE_CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX}") - -# Set CMAKE_SYSTEM_PROCESSOR from the sysroot name (assuming processor-distro-os). -if ($ENV{SDKTARGETSYSROOT} MATCHES "/sysroots/([a-zA-Z0-9_-]+)-.+-.+") - set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_MATCH_1}) -endif() - -# Include the toolchain configuration subscripts -file( GLOB toolchain_config_files "${CMAKE_CURRENT_LIST_FILE}.d/*.cmake" ) -foreach(config ${toolchain_config_files}) - include(${config}) -endforeach() diff --git a/meta/recipes-devtools/cmake/cmake/SDKToolchainConfig.cmake.template b/meta/recipes-devtools/cmake/cmake/SDKToolchainConfig.cmake.template deleted file mode 100644 index c69569a843..0000000000 --- a/meta/recipes-devtools/cmake/cmake/SDKToolchainConfig.cmake.template +++ /dev/null @@ -1,31 +0,0 @@ -set(SDK_INSTALL_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../../..") -set(HOST_SYSROOT "${SDK_INSTALL_DIR}/sysroots/@OECORE_SDK_SYS") -set(TARGET_SYSROOT "${SDK_INSTALL_DIR}/sysroots/@OECORE_TARGET_SYS") -set(HOST_BIN "${HOST_SYSROOT}/usr/bin") -set(TOOLCHAIN_NAME "@OECORE_TARGET_ALIAS") -set(GCC_DIR "${HOST_BIN}/${TOOLCHAIN_NAME}") - -set(CMAKE_SYSTEM_NAME Linux) -set(CMAKE_SYSTEM_PROCESSOR "@OECORE_TARGET_ARCH") - -set(CMAKE_C_COMPILER "${GCC_DIR}/${TOOLCHAIN_NAME}-gcc") -set(CMAKE_CXX_COMPILER "${GCC_DIR}/${TOOLCHAIN_NAME}-g++") - -set(ARCH_FLAGS "@OECORE_TUNE_CCARGS") -set(CMAKE_C_FLAGS "${ARCH_FLAGS}" CACHE STRING "" FORCE ) -set(CMAKE_CXX_FLAGS "${ARCH_FLAGS}" CACHE STRING "" FORCE ) -set(CMAKE_ASM_FLAGS ${CMAKE_C_FLAGS} CACHE STRING "" FORCE ) -set(CMAKE_LDFLAGS_FLAGS ${CMAKE_C_FLAGS} CACHE STRING "" FORCE ) - -set(CMAKE_SYSROOT "${TARGET_SYSROOT}") - -set(CMAKE_FIND_ROOT_PATH "${TARGET_SYSROOT}" ) - -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER ) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY ) -set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY ) - -set(CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX "") - -set(CMAKE_PROGRAM_PATH "${HOST_SYSROOT}/usr/bin" CACHE STRING "" FORCE) diff --git a/meta/recipes-devtools/cmake/cmake/cmake-setup.py b/meta/recipes-devtools/cmake/cmake/cmake-setup.py deleted file mode 100755 index af587a44cc..0000000000 --- a/meta/recipes-devtools/cmake/cmake/cmake-setup.py +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env python3 - -import os -import string -import sys - -class Template(string.Template): - delimiter = "@" - -class Environ(): - def __getitem__(self, name): - if name == "OECORE_SDK_SYS": - return os.path.basename(os.environ["OECORE_NATIVE_SYSROOT"]) - elif name == "OECORE_TARGET_SYS": - return os.path.basename(os.environ["OECORE_TARGET_SYSROOT"]) - elif name == "OECORE_TARGET_ALIAS": - return os.path.basename(os.environ["TARGET_PREFIX"].strip("-")) - else: - return os.environ[name] - -try: - sysroot = os.environ['OECORE_NATIVE_SYSROOT'] -except KeyError: - print("Not in environment setup, bailing") - sys.exit(1) - -template_file = os.path.join(sysroot, 'usr/share/cmake/SDKToolchainConfig.cmake.template') -cross_file = os.path.join(sysroot, 'usr/share/cmake/%s-toolchain.cmake' % (os.path.basename(os.environ["OECORE_TARGET_SYSROOT"]))) -with open(template_file) as in_file: - template = in_file.read() - output = Template(template).substitute(Environ()) - with open(cross_file, "w") as out_file: - out_file.write(output) diff --git a/meta/recipes-devtools/cmake/cmake/environment.d-cmake.sh b/meta/recipes-devtools/cmake/cmake/environment.d-cmake.sh deleted file mode 100644 index 7bdb19fb6c..0000000000 --- a/meta/recipes-devtools/cmake/cmake/environment.d-cmake.sh +++ /dev/null @@ -1,2 +0,0 @@ -export OE_CMAKE_TOOLCHAIN_FILE="$OECORE_NATIVE_SYSROOT/usr/share/cmake/OEToolchainConfig.cmake" -export OE_CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX="`echo $OECORE_BASELIB | sed -e s/lib//`" diff --git a/meta/recipes-devtools/cmake/cmake_3.23.1.bb b/meta/recipes-devtools/cmake/cmake_3.23.2.bb similarity index 86% rename from meta/recipes-devtools/cmake/cmake_3.23.1.bb rename to meta/recipes-devtools/cmake/cmake_3.23.2.bb index bb7ed83e30..f26bd0afb7 100644 --- a/meta/recipes-devtools/cmake/cmake_3.23.1.bb +++ b/meta/recipes-devtools/cmake/cmake_3.23.2.bb @@ -4,14 +4,6 @@ inherit cmake bash-completion DEPENDS += "curl expat zlib libarchive xz ncurses bzip2" -SRC_URI:append:class-nativesdk = " \ - file://OEToolchainConfig.cmake \ - file://SDKToolchainConfig.cmake.template \ - file://cmake-setup.py \ - file://environment.d-cmake.sh \ - file://0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch \ -" - LICENSE:append = " & BSD-1-Clause & MIT" LIC_FILES_CHKSUM:append = " \ file://Utilities/cmjsoncpp/LICENSE;md5=5d73c165a0f9e86a1342f32d19ec5926 \ @@ -34,6 +26,11 @@ python () { d.setVar("docdir_stripped", docdir_stripped) } +SRC_URI += "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ + file://0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch \ + file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ + file://0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch \ + " EXTRA_OECMAKE=" \ -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-${CMAKE_MAJOR_VERSION} \ -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ -- 2.31.1