diff options
| author |   Matthieu Sozeau <mattam@gentoo.org> | 2005-07-25 23:42:30 +0000 |
|---|---|---|
| committer | Matthieu Sozeau <mattam@gentoo.org> | 2005-07-25 23:42:30 +0000 |
| commit | c0787c239fbeb4f71c343dabd62b04ee1aa14eee (patch) | |
| tree | ee5a4b86e7b53499553d49e0a139eb15abcda15a /dev-lang | |
| parent | Fix building with gcc-2 and dont bomb with alignment errors on some arches. (diff) | |
| download | gentoo-2-c0787c239fbeb4f71c343dabd62b04ee1aa14eee.tar.gz gentoo-2-c0787c239fbeb4f71c343dabd62b04ee1aa14eee.tar.bz2 gentoo-2-c0787c239fbeb4f71c343dabd62b04ee1aa14eee.zip | |
Fix bug #97186.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/ocaml/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/ocaml/Manifest | 13 | ||||
| -rw-r--r-- | dev-lang/ocaml/files/ocaml-3.08.3-gcc4.patch | 20 | ||||
| -rw-r--r-- | dev-lang/ocaml/ocaml-3.08.3.ebuild | 10 |
4 files changed, 36 insertions, 13 deletions
diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog index 1deffb85c9b6..b3eebfce2a91 100644 --- a/dev-lang/ocaml/ChangeLog +++ b/dev-lang/ocaml/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/ocaml # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.62 2005/07/06 23:32:21 herbs Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.63 2005/07/25 23:42:30 mattam Exp $ + + 26 Jul 2005; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.08.3.ebuild: + Added gcc4 patch, thanks to Peter Hjalmarsson <xake@telia.com> (fixes bug + #97186). 06 Jul 2005; Herbie Hopkins <herbs@gentoo.org> ocaml-3.08.3.ebuild: Multilib fixes. diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest index 6e0e223a433b..7f498cde11ad 100644 --- a/dev-lang/ocaml/Manifest +++ b/dev-lang/ocaml/Manifest @@ -1,15 +1,13 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 ede360aa66fcf54120c19798f0421e61 ocaml-3.08.ebuild 2209 MD5 e3554fd0d2b4cbd09694d68ca3edb0d8 ocaml-3.08.1.ebuild 2149 MD5 d3e28c5c99b056007b6b5b0781a4e542 ocaml-3.06-r2.ebuild 1660 MD5 ef7cc12a4ff8aeec9ddb58ff65f7e3c0 ocaml-3.07-r1.ebuild 2910 -MD5 692d7dad58640c908f7d0ceaf7199b38 ocaml-3.08.3.ebuild 2204 +MD5 9ff9badd991aad7645361b4991e666fb ocaml-3.08.3.ebuild 2294 MD5 9db66d06a227d3fc07aa956bbc4499e7 ChangeLog 9935 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155 MD5 4df214d6cd74b3c5955d868879dd6cc7 files/ocaml-3.06-tcltk-8.4compat-patch.bz2 639 MD5 8213fcf5533d0317af0486896b7afdd3 files/ocaml-rebuild.sh 1331 +MD5 c57fc46d92565b5d44c8c4f2a4a072d3 files/ocaml-3.08.3-gcc4.patch 710 MD5 13c4abf06e236e8835011a387f90ecc9 files/digest-ocaml-3.06-r2 63 MD5 c42de320103c2d3eb1aa4002e2e0716b files/digest-ocaml-3.07-r1 130 MD5 45ff13419dd955aa86d021abbf325fc2 files/ocaml-3.07-hppa.patch 15730 @@ -17,10 +15,3 @@ MD5 3854a7d6aaedc7d5fde7239776cec5cf files/digest-ocaml-3.08.1 66 MD5 d80f37fe859bc2ea8f71e13f02578275 files/digest-ocaml-3.08.3 66 MD5 77519cb4017543f060a963387b593299 files/digest-ocaml-3.08 65 MD5 91579cecf8659312c2324d8d40709433 files/ocaml-3.06-sparc-configure.patch 1660 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCzGon2G5bA0cA/ScRAgzbAKDBU2P1Mgo9pXkZWlN7lX+SxSwCmQCgkm/2 -o8auOy2s9/cQPriJotmkc64= -=pjI6 ------END PGP SIGNATURE----- diff --git a/dev-lang/ocaml/files/ocaml-3.08.3-gcc4.patch b/dev-lang/ocaml/files/ocaml-3.08.3-gcc4.patch new file mode 100644 index 000000000000..b172ace08a6b --- /dev/null +++ b/dev-lang/ocaml/files/ocaml-3.08.3-gcc4.patch @@ -0,0 +1,20 @@ +--- ocaml-3.08.3/otherlibs/num/bng_ia32.c.x86 2005-05-09 15:24:29.000000000 -0400 ++++ ocaml-3.08.3/otherlibs/num/bng_ia32.c 2005-05-09 22:02:50.000000000 -0400 +@@ -121,7 +121,7 @@ + "leal 4(%1), %1 \n\t" + "decl %2 \n\t" + "jnz 1b" +- : "+&r" (a), "+&r" (b), "+&rm" (blen), "+&r" (out) ++ : "+&r" (a), "+&r" (b), "+m" (blen), "+&r" (out) + : "rm" (d) + : "eax", "edx"); + } +@@ -164,7 +164,7 @@ + "leal 4(%1), %1 \n\t" + "decl %2 \n\t" + "jnz 1b" +- : "+&r" (a), "+&r" (b), "+&rm" (blen), "+&rm" (out), "=&r" (tmp) ++ : "+&r" (a), "+&r" (b), "+m" (blen), "+m" (out), "=&r" (tmp) + : "rm" (d) + : "eax", "edx"); + } diff --git a/dev-lang/ocaml/ocaml-3.08.3.ebuild b/dev-lang/ocaml/ocaml-3.08.3.ebuild index 693d1e20b747..78242af4bff3 100644 --- a/dev-lang/ocaml/ocaml-3.08.3.ebuild +++ b/dev-lang/ocaml/ocaml-3.08.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.08.3.ebuild,v 1.3 2005/07/06 23:32:21 herbs Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.08.3.ebuild,v 1.4 2005/07/25 23:42:30 mattam Exp $ inherit flag-o-matic eutils multilib @@ -24,6 +24,14 @@ pkg_setup() { ewarn } +src_unpack() { + unpack ${A} + cd ${S} + + #GCC4 patch + epatch ${FILESDIR}/${P}-gcc4.patch +} + src_compile() { filter-flags "-fstack-protector" replace-flags "-O?" -O2 |