Force -O0 on arm

Package-Manager: portage-2.1.7.17/cvs/Linux ia64

4 files changed, 15 insertions, 17 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index 227ad7fd3f0b..3101ede9e7b1 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/ocaml
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.176 2010/04/12 06:34:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.177 2010/04/19 17:43:17 armin76 Exp $
+
+  19 Apr 2010; Raúl Porcel <armin76@gentoo.org> ocaml-3.10.2.ebuild,
+  ocaml-3.11.2.ebuild:
+  Force -O0 on arm
 
   12 Apr 2010; Alexis Ballier <aballier@gentoo.org> -ocaml-3.11.1.ebuild:
   remove old
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 8b57173e1fda..536a4889ebdc 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ocaml-3.10.0-automagic.patch 1849 RMD160 6986c47d9d2d9bdaf246f3399ccc59a5751fe86d SHA1 d999c1023c5aa07316d8405fde6ebf3a1bcb2b9f SHA256 f959da02f8b31f3d1ad5b76426d493b50c87dc3a6241204470866a321ece40f9
 AUX ocaml-3.10.0-call-ld-with-proper-ldflags.patch 1497 RMD160 7eef667019e79f2877836f77a31466f9d301725b SHA1 36d95fb8b05e7bbff8e5f49a8f1faec5f11f0c78 SHA256 13d6cc7401c8374327e438517975fe9abf1b99030bb3243f2adb91d12570bc8d
 AUX ocaml-3.10.0-configure.patch 5644 RMD160 1a63847a6e632f59fef8ff448b96bc45da15eae5 SHA1 6a030e48dd5fc399b985dd99e21b6c0e6b95a12e SHA256 f42e11db2d184532aa561b0b117f7ce5850bb50981ea997d08eee34f826360ac
@@ -10,14 +7,7 @@ AUX ocaml-rebuild.sh 1055 RMD160 a75f61820cfdc262912cc5af1241779bf900d4d7 SHA1 a
 DIST ocaml-3.10.2.tar.bz2 2284860 RMD160 f631230b090dbd9bf9a9f71631cd0347c033cbb1 SHA1 f604580bf2943891d8faf265eeb900bbe90abce0 SHA256 3755a32da1a7490d47fff7838c12c754d3fcfe69d7c9ff2358704259dc477c58
 DIST ocaml-3.11.2.tar.bz2 2346284 RMD160 a407e579b7fa134fc8126c5c5b544dd60cedecb1 SHA1 59053ce0078da2367f4ce61da886d22c6e86a46d SHA256 86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143
 DIST ocaml-patches-1.tar.bz2 3108 RMD160 ad56f8be4b15347794f3167be82124fcdbf6f6dc SHA1 542ae4c2b1515730fe0c9050b6658106ef69ad19 SHA256 ad1c252cba7cc50f70d19049fcd78aa359672e436ab9906424548229a04afa49
-EBUILD ocaml-3.10.2.ebuild 4519 RMD160 c74e33993f7220e03c05bd53b8561314fd2005d7 SHA1 6f0ed3f24d696e157593d0d10da8e90c6afa8dcf SHA256 877db782c1b7f868698aef2ac7ffafa3ef45c56ffd8f59c25fa83866f2de19d8
-EBUILD ocaml-3.11.2.ebuild 4058 RMD160 82434893cb2736e86952c01ef62bdaab1d4bce45 SHA1 27ad3c4a085ed61ba03febabf95dee1c7a2772b6 SHA256 74471c6532eab2d22ec63733dd07e8b89934485cc7bd65e31440235fa4d57b00
-MISC ChangeLog 27850 RMD160 a593314a461f76458e9534c004255d3db90d5123 SHA1 eb38b472bd0d1de1bab3a7ba0a81544326a7105e SHA256 546ba173e88dccf052a98dbf18c6ce0b55c9d1d6ad8d0b408246615fb8e6a370
+EBUILD ocaml-3.10.2.ebuild 4594 RMD160 067c0320111323441eba032a996e53dcaedad9d0 SHA1 db6936e27e2937e79b73a52cce926c8d60052c25 SHA256 188f4b1af35af6ca6979e22b56c76a67cb9e250411fec722c747861e9111c755
+EBUILD ocaml-3.11.2.ebuild 4133 RMD160 e115e5f527b547898efc8ee26fbcf57777c29342 SHA1 c4276c47468216600fa5b5dfcb0bbac97d650655 SHA256 d95dad71a6052762ef50223623eb5a81ba465af961c506c750a586341429b84f
+MISC ChangeLog 27962 RMD160 bba7558a7fcb935d981ab99db2cd8f97a39c281f SHA1 ec6320505af104eb0db53b7555271f77a856af4e SHA256 e794d14f94af10d28fead1ae24da8d481b57fb6417a9bab55cdd2a8d77468cfe
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvCvugACgkQvFcC4BYPU0rsOwCfcwl7xukb4d3xi2v23n2xNUtG
-NYQAoMRLxUklgKquUYKmDhwGnIiNtc5C
-=jMIX
------END PGP SIGNATURE-----
diff --git a/dev-lang/ocaml/ocaml-3.10.2.ebuild b/dev-lang/ocaml/ocaml-3.10.2.ebuild
index 18d928ee8405..f0fbfc742d5f 100644
--- a/dev-lang/ocaml/ocaml-3.10.2.ebuild
+++ b/dev-lang/ocaml/ocaml-3.10.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.10.2.ebuild,v 1.16 2009/08/02 12:19:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.10.2.ebuild,v 1.17 2010/04/19 17:43:17 armin76 Exp $
 
 EAPI="1"
 
@@ -72,6 +72,8 @@ src_compile() {
 
 	# It doesn't compile on alpha without this LDFLAGS
 	use alpha && append-ldflags "-Wl,--no-relax"
+	# Fails to build on arm if >=O0 is used
+	use arm && replace-flags "-O?" -O0
 
 	use tk || myconf="${myconf} -no-tk"
 	use ncurses || myconf="${myconf} -no-curses"
diff --git a/dev-lang/ocaml/ocaml-3.11.2.ebuild b/dev-lang/ocaml/ocaml-3.11.2.ebuild
index 948c8511599d..da644e60cb12 100644
--- a/dev-lang/ocaml/ocaml-3.11.2.ebuild
+++ b/dev-lang/ocaml/ocaml-3.11.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.2.ebuild,v 1.1 2010/01/20 18:42:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.2.ebuild,v 1.2 2010/04/19 17:43:17 armin76 Exp $
 
 EAPI="1"
 
@@ -57,6 +57,8 @@ src_compile() {
 
 	# It doesn't compile on alpha without this LDFLAGS
 	use alpha && append-ldflags "-Wl,--no-relax"
+	# Fails to build on arm if >O0 is used
+	use arm && replace-flags "-O?" -O0
 
 	use tk || myconf="${myconf} -no-tk"
 	use ncurses || myconf="${myconf} -no-curses"