From 9d314ffa1cf878c01cd334d1258e52b89ad53d6e Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Sun, 26 Jun 2022 21:56:04 +0000 Subject: [PATCH] Build with clang 11 to avoid armv7 contamination. --- cmake_modules/FindClang.cmake | 2 +- debian/changelog | 5 ++++- debian/control | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake_modules/FindClang.cmake b/cmake_modules/FindClang.cmake index 01bef4b..de9b04f 100644 --- 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 8f1000b..f8fe144 100644 --- 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 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 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 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 da91b83..0008eba 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Dmitry E. Oboukhov , Gianfranco Costamagna 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], -- 2.30.2