Skip to contentSkip to conversation

cmake: drop OE specific environment variable support

PATCH New [email protected] 1 participant 2 messages Aug 22, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 cmake: drop OE specific environment variable support

From: Chen Qi <[email protected]>

CMAKE_TOOLCHAIN_FILE is now also a supported environment variable, we can export it directly. There's no need to use a OE specific patch to add OE_CMAKE_TOOLCHAIN_FILE support.

---
 .../cmake/cmake-native_3.26.4.bb              |  1 -
 ...stem-use-oe-environment-vars-to-load.patch | 44 -------------------
 .../cmake/cmake/environment.d-cmake.sh        |  2 +-
 meta/recipes-devtools/cmake/cmake_3.26.4.bb   |  1 -
 4 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch
meta/recipes-devtools/cmake/cmake-native_3.26.4.bb +0 -1
index 2177aa81a4..26a3331cb0 100644
@@ -5,7 +5,6 @@ DEPENDS += "bzip2-replacement-native xz-native zlib-native ncurses-native zstd-n
 
 SRC_URI += "file://OEToolchainConfig.cmake \
             file://environment.d-cmake.sh \
-            file://0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch \
             file://0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch \
             file://0001-CMakeLists.txt-disable-USE_NGHTTP2.patch \
             "
meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch deleted +0 -44

44 lines not on this page · raw message

meta/recipes-devtools/cmake/cmake/environment.d-cmake.sh +1 -1
index 7bdb19fb6c..c94b6bb3e3 100644
@@ -1,2 +1,2 @@
-export OE_CMAKE_TOOLCHAIN_FILE="$OECORE_NATIVE_SYSROOT/usr/share/cmake/OEToolchainConfig.cmake"
+export 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//`"
meta/recipes-devtools/cmake/cmake_3.26.4.bb +0 -1
index bb7ed83e30..ae29a3a945 100644
@@ -9,7 +9,6 @@ SRC_URI:append:class-nativesdk = " \
     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"
Signature · 1 line
2.40.0
#1 lore raw

PATCH 2/2 cmake.bbclass: fix allarch override syntax

From: Chen Qi <[email protected]>

The override syntax should be ":allarch" instead of "_allarch".

---
 meta/classes-recipe/cmake.bbclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
meta/classes-recipe/cmake.bbclass +4 -4
index 0dda104a69..ea836d5c0d 100644
@@ -51,10 +51,10 @@ OECMAKE_CXX_COMPILER ?= "${@oecmake_map_compiler('CXX', d)[0]}"
 OECMAKE_CXX_COMPILER_LAUNCHER ?= "${@oecmake_map_compiler('CXX', d)[1]}"
 
 # clear compiler vars for allarch to avoid sig hash difference
-OECMAKE_C_COMPILER_allarch = ""
-OECMAKE_C_COMPILER_LAUNCHER_allarch = ""
-OECMAKE_CXX_COMPILER_allarch = ""
-OECMAKE_CXX_COMPILER_LAUNCHER_allarch = ""
+OECMAKE_C_COMPILER:allarch = ""
+OECMAKE_C_COMPILER_LAUNCHER:allarch = ""
+OECMAKE_CXX_COMPILER:allarch = ""
+OECMAKE_CXX_COMPILER_LAUNCHER:allarch = ""
 
 OECMAKE_RPATH ?= ""
 OECMAKE_PERLNATIVE_DIR ??= ""
Signature · 1 line
2.40.0