Package: release.debian.org Severity: normal Tags: jessie User: release.debian.org@packages.debian.org Usertags: pu The icedove package currently on security.d.o and proposed-updates fails to build on armhf because some files get built with -mfloat-abi=softfp. This should hopefully fix that. Cheers, Julien
diff -Nru icedove-38.7.0/debian/changelog icedove-38.7.0/debian/changelog
--- icedove-38.7.0/debian/changelog 2016-03-16 12:39:57.000000000 +0100
+++ icedove-38.7.0/debian/changelog 2016-05-04 17:22:43.000000000 +0200
@@ -1,3 +1,14 @@
+icedove (38.7.0-1~deb8u2) jessie; urgency=medium
+
+ * Non-maintainer upload: steal arm build fixes from the firefox package.
+
+ [ Mike Hommey ]
+ * media/libvpx/moz.build: Build libvpx neon code without -mthumb and
+ -mfloat-abi=softfp. Closes: #795337.
+ * configure.in: Build libvpx neon code with -mfloat-abi=softfp on armel.
+
+ -- Julien Cristau <jcristau@debian.org> Wed, 04 May 2016 17:14:38 +0200
+
icedove (38.7.0-1~deb8u1) stable-security; urgency=medium
* [cb9c003] Imported Upstream version 38.7.0
diff -Nru icedove-38.7.0/debian/patches/fixes/Bug-1194905-Build-libvpx-neon-code-without-mthumb-an.patch icedove-38.7.0/debian/patches/fixes/Bug-1194905-Build-libvpx-neon-code-without-mthumb-an.patch
--- icedove-38.7.0/debian/patches/fixes/Bug-1194905-Build-libvpx-neon-code-without-mthumb-an.patch 1970-01-01 01:00:00.000000000 +0100
+++ icedove-38.7.0/debian/patches/fixes/Bug-1194905-Build-libvpx-neon-code-without-mthumb-an.patch 2016-05-04 17:22:43.000000000 +0200
@@ -0,0 +1,33 @@
+From 78393b4bd35ea4f8d92c6cbfcce5919fcbaa4f44 Mon Sep 17 00:00:00 2001
+From: Mike Hommey <mh+mozilla@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 -Nru icedove-38.7.0/debian/patches/fixes/Followup-to-bug-1194905-add-mfloat-abi-softfp-when-t.patch icedove-38.7.0/debian/patches/fixes/Followup-to-bug-1194905-add-mfloat-abi-softfp-when-t.patch
--- icedove-38.7.0/debian/patches/fixes/Followup-to-bug-1194905-add-mfloat-abi-softfp-when-t.patch 1970-01-01 01:00:00.000000000 +0100
+++ icedove-38.7.0/debian/patches/fixes/Followup-to-bug-1194905-add-mfloat-abi-softfp-when-t.patch 2016-05-04 17:22:43.000000000 +0200
@@ -0,0 +1,30 @@
+From 53156c9af7d9ac4ee5d30274976856718f95aa77 Mon Sep 17 00:00:00 2001
+From: Mike Hommey <mh@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 -Nru icedove-38.7.0/debian/patches/series icedove-38.7.0/debian/patches/series
--- icedove-38.7.0/debian/patches/series 2016-03-16 12:39:57.000000000 +0100
+++ icedove-38.7.0/debian/patches/series 2016-05-04 17:22:43.000000000 +0200
@@ -48,3 +48,5 @@
jessie-security/decrease-SQLVERSION-to-jessie-version.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
Attachment:
signature.asc
Description: PGP signature