From b0551cce647340c8f880726dcf51c44037ff2b18 Mon Sep 17 00:00:00 2001 From: makise-homura Date: Thu, 4 Apr 2024 22:39:06 +0300 Subject: cmArgumentParserTypes: Workaround for ICE on e2k Original report by Ilya Kurdyukov from Alt Linux Team Link: https://git.altlinux.org/gears/c/cmake.git?p=cmake.git;a=commitdiff;h=320f02347da0fe728e715a34a67e6d4d6241d132 --- Source/cmArgumentParserTypes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/cmArgumentParserTypes.h b/Source/cmArgumentParserTypes.h index 7daae09..3e0fae4 100644 --- a/Source/cmArgumentParserTypes.h +++ b/Source/cmArgumentParserTypes.h @@ -4,7 +4,7 @@ #include "cmConfigure.h" // IWYU pragma: keep -#if defined(__SUNPRO_CC) +#if defined(__SUNPRO_CC) || defined(__EDG__) # include # include -- cgit v0.12 From 8f89ecb0739bdc07bdee2bbd08d8f53e4604ed8a Mon Sep 17 00:00:00 2001 From: makise-homura Date: Thu, 4 Apr 2024 22:46:47 +0300 Subject: Tests: Exclude more tests found to be failing on broken libc on Elbrus Since last commit on this topic on Jan 15, 2024, nightly testing has found some other CPack tests failing on broken libc on Elbrus, which was revealed after transition to libuv. These tests are excluded in this condition. --- Tests/RunCMake/CMakeLists.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index a82c79f..9e85179 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -1087,11 +1087,22 @@ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "e2k" AND NOT DEFINED CMake_TEST_E2K_BROKEN_L DEB.CUSTOM_NAMES DEB.DEB_PACKAGE_VERSION_BACK_COMPATIBILITY DEB.PROJECT_META DEB.DEPENDENCIES + DEB.EXTRA + DEB.GENERATE_SHLIBS_LDCONFIG + DEB.LONG_FILENAMES + DEB.MD5SUMS + DEB.EMPTY_DIR + DEB.DEFAULT_PERMISSIONS + DEB.VERSION + DEB.TIMESTAMPS RPM.PARTIALLY_RELOCATABLE_WARNING RPM.PER_COMPONENT_FIELDS RPM.USER_FILELIST RPM.DIST RPM.AUTO_SUFFIXES + 7Z + TXZ + TBZ2 TGZ ZIP STGZ -- cgit v0.12