diff options
Diffstat (limited to 'poky/meta/recipes-devtools/cmake')
-rw-r--r-- | poky/meta/recipes-devtools/cmake/cmake-native_3.22.2.bb (renamed from poky/meta/recipes-devtools/cmake/cmake-native_3.22.1.bb) | 0 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/cmake/cmake.inc | 4 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake | 1 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/cmake/cmake_3.22.2.bb (renamed from poky/meta/recipes-devtools/cmake/cmake_3.22.1.bb) | 0 |
4 files changed, 2 insertions, 3 deletions
diff --git a/poky/meta/recipes-devtools/cmake/cmake-native_3.22.1.bb b/poky/meta/recipes-devtools/cmake/cmake-native_3.22.2.bb index 335097d387..335097d387 100644 --- a/poky/meta/recipes-devtools/cmake/cmake-native_3.22.1.bb +++ b/poky/meta/recipes-devtools/cmake/cmake-native_3.22.2.bb diff --git a/poky/meta/recipes-devtools/cmake/cmake.inc b/poky/meta/recipes-devtools/cmake/cmake.inc index 628734ac73..a8bd4311c4 100644 --- a/poky/meta/recipes-devtools/cmake/cmake.inc +++ b/poky/meta/recipes-devtools/cmake/cmake.inc @@ -21,10 +21,10 @@ 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] = "0e998229549d7b3f368703d20e248e7ee1f853910d42704aa87918c213ea82c0" +SRC_URI[sha256sum] = "3c1c478b9650b107d452c5bd545c72e2fad4e37c09b89a1984b9a2f46df6aced" UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" # This is specific to the npm package that installs cmake, so isn't # relevant to OpenEmbedded -CVE_CHECK_WHITELIST += "CVE-2016-10642" +CVE_CHECK_IGNORE += "CVE-2016-10642" diff --git a/poky/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake b/poky/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake index 8f6f3a272d..86446c3ace 100644 --- a/poky/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake +++ b/poky/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake @@ -2,7 +2,6 @@ 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_LDFLAGS_FLAGS ${CMAKE_CXX_FLAGS} CACHE STRING "" FORCE ) set( CMAKE_SYSROOT $ENV{OECORE_TARGET_SYSROOT} ) set( CMAKE_FIND_ROOT_PATH $ENV{OECORE_TARGET_SYSROOT} ) diff --git a/poky/meta/recipes-devtools/cmake/cmake_3.22.1.bb b/poky/meta/recipes-devtools/cmake/cmake_3.22.2.bb index 36c6357dd8..36c6357dd8 100644 --- a/poky/meta/recipes-devtools/cmake/cmake_3.22.1.bb +++ b/poky/meta/recipes-devtools/cmake/cmake_3.22.2.bb |