Build with clang 11 to avoid armv7 contamination.

diff --git a/cmake_modules/FindClang.cmake b/cmake_modules/FindClang.cmake
index 01bef4be5863a6fd448a9c15c81f1c02c25408b9..de9b04fd4a2dc5dfa2ce1e6e9e6040438fc1b8d7 100644 (file)
--- a/cmake_modules/FindClang.cmake
+++ b/cmake_modules/FindClang.cmake
@@ -11,7 +11,7 @@
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 find_program(CLANG_EXECUTABLE
-        NAMES clang-mp-3.3 clang-mp-3.2 clang-mp-3.1 clang-mp-3.0 clang
+        NAMES clang-11
         PATHS /opt/local/bin /usr/local/bin /usr/bin)
 
 if (CLANG_EXECUTABLE)

diff --git a/debian/changelog b/debian/changelog
index 8f1000b3e03447a6027d83d4a8f1beaf3f393ef0..f8fe14412a8eb02f6445c248b739f2fc63b22333 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,10 @@ hedgewars (1.0.0-16+rpi1) bookworm-staging; urgency=medium
   [changes brought forward from 1.0.0-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 24 Nov 2019 13:14:55 +0000]
   * Force use of C.UTF-8 locale, the build fails under some locales (e.g. POSIX).
 
- -- Raspbian forward porter <root@raspbian.org>  Sun, 27 Mar 2022 07:02:42 +0000
+  [changes introduced in 1.0.0-16+rpi1 by Peter Michael Green]
+  * Forve build with clang 11, newer versions cause armv7 contamination.
+
+ -- Peter Micheal Green <plugwash@raspbian.org>  Sun, 26 Jun 2022 21:54:37 +0000
 
 hedgewars (1.0.0-16) unstable; urgency=medium
 

diff --git a/debian/control b/debian/control
index da91b83bc304a343dee07eb87d43eef17b4dc429..0008ebaa2343d6d1574b07f8edf7b869800addbc 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Dmitry E. Oboukhov <unera@debian.org>,
            Gianfranco Costamagna <locutusofborg@debian.org>
 Standards-Version: 4.5.0
 Build-Depends: cmake,
-               clang [armel armhf i386 mipsel ppc64el],
+               clang-11 [armel armhf i386 mipsel ppc64el],
                debhelper-compat (= 12),
                dpkg-dev (>= 1.16.1~),
                fp-compiler [!armel !armhf !i386 !mipsel !ppc64el],