Add neon disable code, brought over from firefox-esr.

diff --git a/build/moz.configure/arm.configure b/build/moz.configure/arm.configure
index 5819df78cf727d701a627e0fb3d3483ec0bf3ea0..a0fb9f2bf1aac17c6bc5121af92b1d4e84bad86c 100644 (file)
--- a/build/moz.configure/arm.configure
+++ b/build/moz.configure/arm.configure
@@ -226,11 +226,11 @@ set_define('HAVE_ARM_NEON', have_arm_neon)
 # This matches media/webrtc/trunk/webrtc/build/common.gypi.
 @depends(arm_target.arm_arch, when=have_arm_neon)
 def build_arm_neon(arm_arch):
-    return arm_arch >= 7
+    return arm_arch >= 700
 
 
-set_config('BUILD_ARM_NEON', build_arm_neon)
-set_define('BUILD_ARM_NEON', build_arm_neon)
+#set_config('BUILD_ARM_NEON', build_arm_neon)
+#set_define('BUILD_ARM_NEON', build_arm_neon)
 
 
 set_config('ARM_ARCH', depends(arm_target.arm_arch)(lambda x: str(x)))

diff --git a/debian/changelog b/debian/changelog
index 8bf550047f033b93f183e718eb14e1b23414fbd5..3db8c18feb52461813af366767708ffdc0fe4fc7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ thunderbird (1:68.3.0-2~deb10u1+rpi1) buster-staging; urgency=medium
   [changes introduced in 60.4.0-1+rpi1 by Peter Michael Green]
   * Further fixes to clean target (still not completely fixed :( ).
 
+  [changes introduced in 1:68.3.0-2~deb10u1+rpi1 by Peter Michael Green]
+  * Disable neon (patches taken from firefox-esr package)
+
  -- Peter Michael Green <plugwash@raspbian.org>  Mon, 30 Dec 2019 11:50:06 +0000
 
 thunderbird (1:68.3.0-2~deb10u1) stable-security; urgency=medium

diff --git a/debian/patches/series b/debian/patches/series
index 50c4d16a33924554af536ef6d71be7acafc56553..6c84d0595cc4a5078ecfca5cb63637024e88368e 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -39,3 +39,5 @@ debian-hacks/Make-Thunderbird-build-reproducible.patch
 fixes/Bug-1531309-Don-t-use-__PRETTY_FUNCTION__-or-__FUNCTION__.patch
 fixes/Update-bindgen-in-ESR68.-r-glandium-a-RyanVM.patch
 raspbian-rust-triplet-hack.patch
+try-to-disable-neon.patch
+try-harder-to-disable-neon.patch

diff --git a/debian/patches/try-harder-to-disable-neon.patch b/debian/patches/try-harder-to-disable-neon.patch
new file mode 100644 (file)
index 0000000..d5905cd
--- /dev/null
+++ b/debian/patches/try-harder-to-disable-neon.patch
@@ -0,0 +1,21 @@
+From: Peter Michael Green <plugwash@raspbian.org>
+Date: Thu, 7 Nov 2019 11:23:19 +0000
+X-Dgit-Generated: 68.2.0esr-1+rpi1 a8a34a748cbe157a1fb6bfdb2c127ff6ec8416e9
+Subject: Try harder to disable neon.
+
+
+---
+
+--- firefox-esr-68.2.0esr.orig/build/moz.configure/arm.configure
++++ firefox-esr-68.2.0esr/build/moz.configure/arm.configure
+@@ -229,8 +229,8 @@ def build_arm_neon(arm_arch):
+     return arm_arch >= 700
+ 
+ 
+-set_config('BUILD_ARM_NEON', build_arm_neon)
+-set_define('BUILD_ARM_NEON', build_arm_neon)
++#set_config('BUILD_ARM_NEON', build_arm_neon)
++#set_define('BUILD_ARM_NEON', build_arm_neon)
+ 
+ 
+ set_config('ARM_ARCH', depends(arm_target.arm_arch)(lambda x: str(x)))

diff --git a/debian/patches/try-to-disable-neon.patch b/debian/patches/try-to-disable-neon.patch
new file mode 100644 (file)
index 0000000..0ff1242
--- /dev/null
+++ b/debian/patches/try-to-disable-neon.patch
@@ -0,0 +1,19 @@
+From: Peter Michael Green <plugwash@raspbian.org>
+Date: Thu, 7 Nov 2019 08:48:48 +0000
+X-Dgit-Generated: 68.2.0esr-1+rpi1 be4da04b831a114d84fc719b35cbf9cd4014c464
+Subject: Try to disable neon.
+
+
+---
+
+--- firefox-esr-68.2.0esr.orig/build/moz.configure/arm.configure
++++ firefox-esr-68.2.0esr/build/moz.configure/arm.configure
+@@ -226,7 +226,7 @@ set_define('HAVE_ARM_NEON', have_arm_neo
+ # This matches media/webrtc/trunk/webrtc/build/common.gypi.
+ @depends(arm_target.arm_arch, when=have_arm_neon)
+ def build_arm_neon(arm_arch):
+-    return arm_arch >= 7
++    return arm_arch >= 700
+ 
+ 
+ set_config('BUILD_ARM_NEON', build_arm_neon)