From: Peter Michael Green Date: Tue, 15 Feb 2022 19:29:49 +0000 (+0000) Subject: Commit Debian 3.0 (quilt) metadata X-Git-Tag: archive/raspbian/91.6.0esr-1_deb10u1+rpi1~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=13b17739df8ad7de12c5661ea342ebffc35561f7;p=firefox-esr.git Commit Debian 3.0 (quilt) metadata [dgit (8.5) quilt-fixup] --- diff --git a/debian/patches/build-swgl-with-clang-rather-than-gcc-to.patch b/debian/patches/build-swgl-with-clang-rather-than-gcc-to.patch new file mode 100644 index 00000000000..5bd9342926d --- /dev/null +++ b/debian/patches/build-swgl-with-clang-rather-than-gcc-to.patch @@ -0,0 +1,23 @@ +From: Peter Michael Green +Date: Tue, 15 Feb 2022 04:46:48 +0000 +X-Dgit-Generated: 91.6.0esr-1~deb10u1+rpi1 19366e4892794b06a3aa6d9087c2e92a6c246dee +Subject: Build swgl with clang rather than gcc to avoid internal compiler error. + + +--- + +--- firefox-esr-91.6.0esr.orig/gfx/wr/swgl/build.rs ++++ firefox-esr-91.6.0esr/gfx/wr/swgl/build.rs +@@ -129,6 +129,12 @@ fn main() { + + shaders.sort(); + ++ // force build with clang to work around internal compiler error in gcc ++ if let Ok(target) = std::env::var("TARGET") { ++ std::env::set_var(format!("CC_{}", target),"clang"); ++ std::env::set_var(format!("CXX_{}", target),"clang++"); ++ } ++ + // We need to ensure that the C preprocessor does not pull compiler flags from + // the host or target environment. Set up a SWGLPP target with empty flags to + // work around this. diff --git a/debian/patches/series b/debian/patches/series index b617361ef54..c7934b91a80 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -26,3 +26,4 @@ try-to-disable-neon.patch try-harder-to-disable-neon.patch disable-neon-in-qcms.patch use-a-define-instead-of-a-typedef-for-do.patch +build-swgl-with-clang-rather-than-gcc-to.patch