From: Peter Michael Green Date: Wed, 1 Jan 2020 23:47:24 +0000 (+0000) Subject: Add neon disable code, brought over from firefox-esr. X-Git-Tag: archive/raspbian/1%68.5.0-1_deb10u1+rpi1~5 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5e7a7e22e9d1fd462c989a6d68cbf167d286fdb1;p=thunderbird.git Add neon disable code, brought over from firefox-esr. --- diff --git a/build/moz.configure/arm.configure b/build/moz.configure/arm.configure index 5819df78cf..a0fb9f2bf1 100644 --- 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 8bf550047f..3db8c18feb 100644 --- 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 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 50c4d16a33..6c84d0595c 100644 --- 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 index 0000000000..d5905cdd87 --- /dev/null +++ b/debian/patches/try-harder-to-disable-neon.patch @@ -0,0 +1,21 @@ +From: Peter Michael Green +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 index 0000000000..0ff12423a0 --- /dev/null +++ b/debian/patches/try-to-disable-neon.patch @@ -0,0 +1,19 @@ +From: Peter Michael Green +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)