Disable hardcoding of random ARM compiler flags #400617 by Fabio Erculiani.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 40 insertions, 18 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index ee347f6589e8..389d64b2adb2 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.108 2012/01/27 22:49:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.109 2012/01/27 22:51:35 vapier Exp $
+
+  27 Jan 2012; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild,
+  +files/xbmc-9999-no-arm-flags.patch:
+  Disable hardcoding of random ARM compiler flags #400617 by Fabio Erculiani.
 
   27 Jan 2012; Mike Frysinger <vapier@gentoo.org>
   files/xbmc-9999-nomythtv.patch:
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index d2eac5d29ad3..5e06c10bab9d 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -5,26 +5,27 @@ AUX xbmc-10.0-python-2.7.patch 30308 RMD160 15f01d93b0db903eadb5deb94d5092b0a4b6
 AUX xbmc-10.1-gcc-4.6.patch 4295 RMD160 4aee4c91f9d2f9e947d37cd39f2700fc0eaec353 SHA1 5ae755b20e06560aaf1508b80c1f7661ef36802f SHA256 cef1154bc3352b215bfece1a749d901d43ec7aa0c6d050921ae8745c553e84c9
 AUX xbmc-10.1-headers.patch 294 RMD160 74536be4a5e3b939c6360bbc715f30e08226af46 SHA1 2435642148ec291d10bded3036592a6104f5ff03 SHA256 8b8e86cf7edef227e8267c52d60545b753eea11261f078131ee30f9eac8bb002
 AUX xbmc-10.1-libpng-1.5.patch 19253 RMD160 1488504816e668fceb1c3f762738864ea81fa940 SHA1 06e90834bc665eabc3f4e587d551b93af87c1ba5 SHA256 1a0985b91ee9862a538a43689d005dc88d49bf5a70d917896fb69ee416369ff7
-AUX xbmc-9999-nomythtv.patch 5495 RMD160 23bea58cf1ba90593c9b9991022d09686fde9e92 SHA1 b8376baddf2d2084373b6eb5a9b139780c68c615 SHA256 f20703730aeeb16b6f9ccc96d85a306045d9eef858396458ac5356cd56f95876
+AUX xbmc-9999-no-arm-flags.patch 542 RMD160 108586f2956cc27cc9f3c582565bd4e2f22fede0 SHA1 e6dc2f2b63e208fccb0c1ecb50322d6a9c9fda88 SHA256 72164a8b91f3209cff06ea1a103580f827135951a7a798eefabc04ee1a6d3e84
+AUX xbmc-9999-nomythtv.patch 5495 RMD160 d2840c85e5bcfc1bf54d9bbd949110028366149f SHA1 1c4207f3350279308b9935c15f4a78a414c0f58f SHA256 22a82d117a06fc5081752e90739b369323c9b051554bf42baa523a192f507f88
 DIST xbmc-10.1.tar.gz 130187822 RMD160 a4ddb06b396b8ae437bf30bea5b44396b54ebc5b SHA1 7a9f4e2c18a23d687ecfc744f2e051e4f88ef01a SHA256 3403195b7eb1d076523f2394793b7f050df00743892b031f6fea86b998559d8a
 EBUILD xbmc-10.1.ebuild 5390 RMD160 ccb062b93f485e70ffba8d108aae662d10533c12 SHA1 99bcc61eed8b3086085caeaa476e1c646e24bdd1 SHA256 df2669bfd06df9b2cbdb12ba25a5ad2858827f8613f495b2267109a1158a5d35
-EBUILD xbmc-9999.ebuild 5221 RMD160 c97554ab214973400b537f62b968d9c78791d582 SHA1 1c17aed05c8d8c3d4d4724dca9ea059b9b1d65e3 SHA256 69f3f678b8aaa1ffa17fef3faf0fdd750b8c80817ecf1e610eb7667c95a3cd7a
-MISC ChangeLog 16930 RMD160 613e7e3af4c6e3c35fef33c7cc115ee5b60a8931 SHA1 59a9c2211b1160a90cf223cba4964af2213e8471 SHA256 fe8ac334d28eaf4e9303ae43754a7f3f0bd477bd8e05f4311cf44d7f4cb0b6b8
+EBUILD xbmc-9999.ebuild 5281 RMD160 9f54f8f764798608c5b1f50a69c198fe6d4ed19a SHA1 43515abc14d873391e19c7840316f4ac20d83888 SHA256 a5f9020dbc49f022c3694e4a988411a87376f5975ca073ae0b3c8decb017153d
+MISC ChangeLog 17262 RMD160 5a33b1ab7c320b4853cd7014e4dc4d1c6743d3db SHA1 8efbbd25ec268baf13b551ca4de590e24bec3355 SHA256 a5ca20990fcbb4fce2af9c3cf6ad0a7531a910027dc187de4d0e6103df7b2a4b
 MISC metadata.xml 932 RMD160 fbedc1d562949001f2195a49f375d2e4a1fdc7ff SHA1 c102da84b6cd9160308943fc7cc7801aff691a46 SHA256 2f82a971dfec33d4958ee8977011928976c4aab5f4e03139be6a6245bf3eb62d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPHuRTAAoJELEHsLL7fEFWp6gQAMbAqTwU9cfx8fEjpknFmvbg
-yGf+7FonJLQ+itX58mQJiEnsNvP8/B9XvRbfC2Lj/fyqovzCRRFz5HPA3ICHXaq6
-T59HEdlQG+Kx7QnEWhXdKZyUzNu4eVymjbog/e5tRQp/ERZUfhvmLZIxD+B9Qjw3
-ngXy6pZaxSAhrJ4GwgPhrnWH8gUULdo347wJm4VoIL+za23X6QAcYndCTJidVxW6
-B+ifwktEJ0wfxfEzDFyDMJ1ZXtjdeCQTJhNh71/EEhkFAPOfCzJZ5+UJgKm7vKZb
-2ahaflnF9tG2/mlv2xd7jN8B/Fi0Yd2JAUpOV26o/WIeHo1EHWcHyATqs+WDCgQ+
-cLMlZPc/YVzo2h6JoIbGH/ZNZvKyXSl17wD0w9v4fBeAOS41b/qfMMQjlY7KeyhZ
-iuQQ0sPmY3frXEKq/NVfdfWzw6rvcZManxqk33WrV5wrx2ALMTcSWYKrlUFoqc+Q
-4jfcYhZIrtQGK3lsd7ErHkeEh88sn30LcuL9+6sFKzIbVy2NmsoeTOcBtECTjUmk
-5bOrb5+oYfaHhOg2P4DKj8lc50EP9pFd2RlZkjhy8I3VGAoP+eaJXsqaNC2TzEBP
-JyT+apusV0SqQwYFa58NOPxpn0fOaEPkinhrUveYPQpW2i3+IASl3B94r7bJNHuC
-I8VAfhNZxO/wkN2P9Iqs
-=YPA3
+iQIcBAEBAgAGBQJPIyq5AAoJELEHsLL7fEFWdU0P/1V0jokE4HyDWevJ0Wu9A7LM
+sd6JgBCgwgNJ3EcgQA8SCyRI+NXogl7qq01mH6daPf/ohsyPOxrqzFEz7DZ9NIxT
+P7xOi9/nBLNTEtOho8D7IE0Q3ak0rPv7Z07SFhioZidyhHjlxEIdcm+ucP/xFp8P
+6hFJI4d0jAzF+JGB4jDqy80jlGA+Aw9rIW+pUjvLngXbSQvvxvjuRYdsLRShrlS5
+4CGVG9QkXGAJpQkdzPYtXZgjKG7rvIRYPoXngt6xmT43dJ++fY/IdHAwHINfZXi5
+lHfv7A2I3OYCgEtEHhReyH6jkuKz3oNUH5/D2Sjtartu1SD/pi7GIDMhYKCSpSs6
+ZIvy2VbIyWLiq+qCRi7/JHrVPLshXb/ogMi8C3Hid14SyK59Zz8YbNxUCmKbbYFA
+78EvSAWqnakmOsgH2BkkhSk5hOWCuirbfJAMRaDNDr4r2P75MsKAJW8dR5tNm4+r
+s0Ehvz6AH29N5Vd55LIG6e4NOK7OCMFH/F4z0knXipt7vL0ChAQwq/uFNW9i9wjf
+51Voxza7bCMuyRnqLPgXHSDFCdzc9ExSQxCDReOu8UfwtFbKCm6ZB/3wG2I88/9n
++Ltqso2m1MKGx7vXZYga5VNI4qI5LMlCjBf/968I0nRrH2L+glkFXuMYt5XlE3CK
+l7auAVPdWFGwlrc8BNXf
+=iB1a
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/files/xbmc-9999-no-arm-flags.patch b/media-tv/xbmc/files/xbmc-9999-no-arm-flags.patch
new file mode 100644
index 000000000000..179697a8f5ce
--- /dev/null
+++ b/media-tv/xbmc/files/xbmc-9999-no-arm-flags.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/400617
+
+do not force any particular ABI or FPU or SIMD compiler flags for arm
+targets.  let the toolchain and user CFLAGS control that.
+
+--- a/configure.in
++++ b/configure.in
+@@ -571,7 +571,7 @@
+     LIBS="$LIBS -framework DiskArbitration"
+     LIBS="$LIBS -framework ApplicationServices"
+   fi
+-elif test "$use_arch" = "arm"; then
++elif false; then
+   CFLAGS="$CFLAGS -mfloat-abi=softfp -mno-apcs-stack-check"
+   CXXFLAGS="$CXXFLAGS -mfloat-abi=softfp -mno-apcs-stack-check"
+   FFMPEG_EXTRACFLAGS="-mfloat-abi=softfp"
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 005e1452d040..2c870b3fce40 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.96 2012/01/24 17:02:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.97 2012/01/27 22:51:35 vapier Exp $
 
 EAPI="2"
 
@@ -111,6 +111,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
+	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
 
 	# some dirs ship generated autotools, some dont
 	local d