Add patches for arm to fix bug #362237

(Portage version: 2.1.10.7/cvs/Linux ia64)

4 files changed, 105 insertions, 3 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index 45164b55c139..9c75950901aa 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/xulrunner
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.426 2011/07/26 17:02:29 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.427 2011/08/13 17:20:43 armin76 Exp $
+
+  13 Aug 2011; Raúl Porcel <armin76@gentoo.org> xulrunner-2.0.1-r1.ebuild,
+  +files/mozilla-2.0_arm_respect_cflags.patch, +files/arm-bug-644136.patch:
+  Add patches for arm to fix bug #362237
 
   26 Jul 2011; Lars Wendler <polynomial-c@gentoo.org>
   xulrunner-1.9.2.12.ebuild, xulrunner-1.9.2.17.ebuild,
diff --git a/net-libs/xulrunner/files/arm-bug-644136.patch b/net-libs/xulrunner/files/arm-bug-644136.patch
new file mode 100644
index 000000000000..4183f74c5c65
--- /dev/null
+++ b/net-libs/xulrunner/files/arm-bug-644136.patch
@@ -0,0 +1,14 @@
+diff -r 4e4c7457e8f7 js/src/ctypes/libffi/src/arm/sysv.S
+--- a/js/src/ctypes/libffi/src/arm/sysv.S	Sat Apr 02 11:48:22 2011 -0400
++++ b/js/src/ctypes/libffi/src/arm/sysv.S	Sun Apr 03 04:55:15 2011 +0300
+@@ -229,6 +229,10 @@
+         .size    CNAME(ffi_call_SYSV),.ffi_call_SYSV_end-CNAME(ffi_call_SYSV)
+ 
+ 
++/* Below are VFP hard-float ABI call and closure implementations.
++   Add VFP FPU directive here. */
++	.fpu	vfp
++
+ 	@ r0:   fn
+ 	@ r1:   &ecif
+ 	@ r2:   cif->bytes
diff --git a/net-libs/xulrunner/files/mozilla-2.0_arm_respect_cflags.patch b/net-libs/xulrunner/files/mozilla-2.0_arm_respect_cflags.patch
new file mode 100644
index 000000000000..46efe35dc7c4
--- /dev/null
+++ b/net-libs/xulrunner/files/mozilla-2.0_arm_respect_cflags.patch
@@ -0,0 +1,80 @@
+diff -ur mozilla-release.orig//configure.in mozilla-release/configure.in
+--- mozilla-release.orig//configure.in	2011-07-17 13:44:12.000000000 +0200
++++ mozilla-release/configure.in	2011-07-17 13:46:50.000000000 +0200
+@@ -7165,9 +7165,6 @@
+       if test "$GNU_CC"; then
+         AC_DEFINE(MOZ_THUMB2)
+         AC_DEFINE(MOZ_ARM_ARCH)
+-        CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+       else
+         AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
+       fi
+@@ -7181,9 +7178,6 @@
+     arm*)
+       if test "$GNU_CC"; then
+         AC_DEFINE(MOZ_ARM_ARCH)
+-        CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+       else
+         AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
+       fi
+@@ -7192,16 +7186,6 @@
+       AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-ARM CPU architectures])
+     ;;
+   esac
+-else
+-  case "$target_cpu" in
+-    arm*)
+-      if test "$GNU_CC"; then
+-        CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float"
+-        CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -msoft-float"
+-        ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork -msoft-float"
+-      fi
+-      ;;
+-  esac
+ fi
+ 
+ AC_SUBST(MOZ_THUMB2)
+diff -ur mozilla-release.orig//js/src/configure.in mozilla-release/js/src/configure.in
+--- mozilla-release.orig//js/src/configure.in	2011-07-17 13:43:42.000000000 +0200
++++ mozilla-release/js/src/configure.in	2011-07-17 13:47:39.000000000 +0200
+@@ -4607,9 +4607,6 @@
+       if test "$GNU_CC"; then
+         AC_DEFINE(MOZ_THUMB2)
+         AC_DEFINE(MOZ_ARM_ARCH)
+-        CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+       else
+         AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
+       fi
+@@ -4623,9 +4620,6 @@
+     arm*)
+       if test "$GNU_CC"; then
+         AC_DEFINE(MOZ_ARM_ARCH)
+-        CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+       else
+         AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
+       fi
+@@ -4634,16 +4628,6 @@
+       AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-ARM CPU architectures])
+     ;;
+   esac
+-else
+-  case "$target_cpu" in
+-    arm*)
+-      if test "$GNU_CC"; then
+-        CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float"
+-        CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -msoft-float"
+-        ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork -msoft-float"
+-      fi
+-      ;;
+-  esac
+ fi
+ 
+ AC_SUBST(MOZ_THUMB2)
\ No newline at end of file
diff --git a/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild b/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild
index b3e21ef6f6ad..28b025589301 100644
--- a/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild
+++ b/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild,v 1.6 2011/07/26 17:02:29 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild,v 1.7 2011/08/13 17:20:43 armin76 Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -70,9 +70,13 @@ src_prepare() {
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}"
 
-	#64bit big indian support
+	#64bit big endian support
 	epatch "${FILESDIR}/mozilla-2.0_support_64bit_big_endian.patch"
 
+	# Patches needed for ARM, bug 362237
+	epatch "${FILESDIR}/arm-bug-644136.patch"
+	epatch "${FILESDIR}/mozilla-2.0_arm_respect_cflags.patch"
+
 	# Allow user to apply any additional patches without modifing ebuild
 	epatch_user