Hi Christoph,
As discussed I'd like to unbreak the armhf build on Wheezy [1] with the attached
patches. O.k. to upload to wheezy-lts?
Cheers,
-- Guioo
[1]
https://buildd.debian.org/status/fetch.php?pkg=icedove&arch=armhf&ver=38.8.0-1~deb7u1&stamp=1463114213
diff --git a/debian/changelog b/debian/changelog
index bc617bc..4a9718e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+icedove (38.8.0-1~deb7u1.1) oldstable-security; urgency=medium
+
+ * Upload by the Debian LTS team
+ * Backport armhf build fixes to oldstable-security as well
+ (Closes: #823430)
+ * Let mozconfig figure out the number of parallel builds to get the proper
+ build ordering when building the internal nspr to unbreak the armhf build.
+
+ -- Guido Günther <a...@sigxcpu.org> Sun, 15 May 2016 17:48:23 +0200
+
icedove (38.8.0-1~deb7u1) oldstable-security; urgency=medium
* [bac2d5b] Imported Upstream version 38.8.0
diff --git a/debian/mozconfig.default b/debian/mozconfig.default
index adcd153..6beb5c6 100644
--- a/debian/mozconfig.default
+++ b/debian/mozconfig.default
@@ -61,8 +61,6 @@ ac_add_options --enable-xft
ac_add_options --enable-xinerama
# Debian specific things
-PARALLEL_BUILD=$(echo $DEB_BUILD_OPTIONS | sed -e
'/parallel=/!s/.*/1/;s/.*parallel=\([0-9]\+\).*/\1/g')
-mk_add_options MOZ_MAKE_FLAGS="-j$PARALLEL_BUILD"
ac_add_options --with-distribution-id=org.debian
ac_add_options --with-default-mozilla-five-home=/usr/lib/icedove
ac_add_options --with-user-appdir=.mozilla
diff --git
a/debian/patches/fixes/Bug-1194905-Build-libvpx-neon-code-without-mthumb-an.patch
b/debian/patches/fixes/Bug-1194905-Build-libvpx-neon-code-without-mthumb-an.patch
new file mode 100644
index 0000000..cb91a39
--- /dev/null
+++
b/debian/patches/fixes/Bug-1194905-Build-libvpx-neon-code-without-mthumb-an.patch
@@ -0,0 +1,33 @@
+From 78393b4bd35ea4f8d92c6cbfcce5919fcbaa4f44 Mon Sep 17 00:00:00 2001
+From: Mike Hommey <mh+mozi...@glandium.org>
+Date: Sat, 15 Aug 2015 08:53:54 +0900
+Subject: [PATCH 1/2] Bug 1194905 - Build libvpx neon code without -mthumb and
+ -mfloat-abi=softfp
+
+-mfloat-abi=softfp is hardcoding an ABI that may not match everything else
+in Gecko, which is bound to fail. It's also unrelated to building NEON code.
+-mthumb is also unrelated to building NEON code, and should be left as it
+is for everything else.
+Now, interestingly, we also have a VPX_ASFLAGS variable that just contains
+the right things instead of hardcoding them in the moz.build, so just use
+that instead.
+---
+ mozilla/media/libvpx/moz.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mozilla/media/libvpx/moz.build b/mozilla/media/libvpx/moz.build
+index a1138f4..a8298d4 100644
+--- a/mozilla/media/libvpx/moz.build
++++ b/mozilla/media/libvpx/moz.build
+@@ -65,7 +65,7 @@ if CONFIG['VPX_ARM_ASM']:
+
+ for f in SOURCES:
+ if f.endswith('.c') and 'neon' in f:
+- SOURCES[f].flags += ['-march=armv7-a', '-mthumb',
'-mfloat-abi=softfp', '-mfpu=neon']
++ SOURCES[f].flags += CONFIG['VPX_ASFLAGS'].split()
+
+ # boolhuff_armv5te.asm defines the same functions as boolhuff.c instead of
+ # using RTCD, so we have to make sure we only add one of the two.
+--
+2.8.1
+
diff --git
a/debian/patches/fixes/Followup-to-bug-1194905-add-mfloat-abi-softfp-when-t.patch
b/debian/patches/fixes/Followup-to-bug-1194905-add-mfloat-abi-softfp-when-t.patch
new file mode 100644
index 0000000..af2133c
--- /dev/null
+++
b/debian/patches/fixes/Followup-to-bug-1194905-add-mfloat-abi-softfp-when-t.patch
@@ -0,0 +1,30 @@
+From 53156c9af7d9ac4ee5d30274976856718f95aa77 Mon Sep 17 00:00:00 2001
+From: Mike Hommey <m...@glandium.org>
+Date: Fri, 28 Aug 2015 17:46:29 +0900
+Subject: [PATCH 2/2] Followup to bug 1194905: add -mfloat-abi=softfp when
+ toolchain abi is soft
+
+---
+ mozilla/configure.in | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/mozilla/configure.in b/mozilla/configure.in
+index 4c217e5..3edcfa4 100644
+--- a/mozilla/configure.in
++++ b/mozilla/configure.in
+@@ -5527,6 +5527,12 @@ if test -n "$MOZ_VPX" -a -z "$MOZ_NATIVE_LIBVPX"; then
+ VPX_AS_CONVERSION='$(PERL)
$(topsrcdir)/media/libvpx/build/make/ads2gas.pl'
+ VPX_ASM_SUFFIX="$ASM_SUFFIX"
+ VPX_ARM_ASM=1
++ AC_TRY_COMPILE([],
++ [#ifndef __SOFTFP__
++ #error "float-abi is either softfp or hardfp"
++ #endif],
++ VPX_ASFLAGS="$VPX_ASFLAGS -mfloat-abi=softfp"
++ )
+ fi
+ ;;
+ *:x86)
+--
+2.8.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 5d8f6d8..5bc6d7a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -48,3 +48,5 @@
fixes/Bug-1165654-Cleanup-how-libjpeg-turbo-assembly-build.patch
wheezy-security/sqlite-dev-revert-version-to-3.7.13.patch
porting-mips/Fix-build-error-in-MIPS-SIMD-when-compiling-with-mfp.patch
debian-hacks/Add-unminified-jquery-and-jquery-ui-files.patch
+fixes/Bug-1194905-Build-libvpx-neon-code-without-mthumb-an.patch
+fixes/Followup-to-bug-1194905-add-mfloat-abi-softfp-when-t.patch
