From db7a57b9cbe7f6f17ea3b63b379589cfab1bee72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20R=C3=B6hling?= Date: Wed, 20 Apr 2022 20:05:06 +0200 Subject: [PATCH] Work around regression with qa=+canary Upstream has reverted the problematic commit for the next point release, pending further investigation. Closes: #1009408 Gbp-Dch: full --- ...2-Revert-commit-f745e049-temporarily.patch | 24 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 25 insertions(+) create mode 100644 debian/patches/0002-Revert-commit-f745e049-temporarily.patch diff --git a/debian/patches/0002-Revert-commit-f745e049-temporarily.patch b/debian/patches/0002-Revert-commit-f745e049-temporarily.patch new file mode 100644 index 000000000..374a5743e --- /dev/null +++ b/debian/patches/0002-Revert-commit-f745e049-temporarily.patch @@ -0,0 +1,24 @@ +From: =?utf-8?q?Timo_R=C3=B6hling?= +Date: Wed, 20 Apr 2022 20:03:10 +0200 +Subject: Revert commit f745e049 temporarily + +This commit introduced a regression with qa=+canary; it has +been reverted upstream pending further investigation. + +Forwarded: https://gitlab.kitware.com/cmake/cmake/-/issues/23432 +--- + Modules/CMakeCheckCompilerFlagCommonPatterns.cmake | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake b/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake +index 8f59acd..bda1d71 100644 +--- a/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake ++++ b/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake +@@ -13,7 +13,6 @@ macro (CHECK_COMPILER_FLAG_COMMON_PATTERNS _VAR) + FAIL_REGEX "unknown .*option" # Clang + FAIL_REGEX "optimization flag .* not supported" # Clang + FAIL_REGEX "unknown argument ignored" # Clang (cl) +- FAIL_REGEX "warning: .* ignored" # Clang (linker) + FAIL_REGEX "ignoring unknown option" # MSVC, Intel + FAIL_REGEX "warning D9002" # MSVC, any lang + FAIL_REGEX "option.*not supported" # Intel diff --git a/debian/patches/series b/debian/patches/series index 307a39ea3..8830a6e48 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-Prefer-Debian-default-version-of-Python.patch +0002-Revert-commit-f745e049-temporarily.patch