| 1 |
aballier 09/06/20 14:54:57 |
| 2 |
|
| 3 |
Modified: ChangeLog ocaml-3.11.1.ebuild |
| 4 |
Log: |
| 5 |
Make a tarball from the various patches |
| 6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.167 dev-lang/ocaml/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ChangeLog?rev=1.167&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ChangeLog?rev=1.167&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ChangeLog?r1=1.166&r2=1.167 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v |
| 18 |
retrieving revision 1.166 |
| 19 |
retrieving revision 1.167 |
| 20 |
diff -u -r1.166 -r1.167 |
| 21 |
--- ChangeLog 19 Jun 2009 21:55:06 -0000 1.166 |
| 22 |
+++ ChangeLog 20 Jun 2009 14:54:57 -0000 1.167 |
| 23 |
@@ -1,6 +1,12 @@ |
| 24 |
# ChangeLog for dev-lang/ocaml |
| 25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.166 2009/06/19 21:55:06 aballier Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.167 2009/06/20 14:54:57 aballier Exp $ |
| 28 |
+ |
| 29 |
+ 20 Jun 2009; Alexis Ballier <aballier@g.o> |
| 30 |
+ -files/ocaml-3.11.0_beta1-configure.patch, |
| 31 |
+ -files/ocaml-3.11.0_beta1-exec-stack-fixes.patch, |
| 32 |
+ -files/ocaml-3.11.0_beta1-yaccldflags.patch, ocaml-3.11.1.ebuild: |
| 33 |
+ Make a tarball from the various patches |
| 34 |
|
| 35 |
19 Jun 2009; Alexis Ballier <aballier@g.o> -ocaml-3.11.0.ebuild: |
| 36 |
remove old |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.2 dev-lang/ocaml/ocaml-3.11.1.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ocaml-3.11.1.ebuild?rev=1.2&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ocaml-3.11.1.ebuild?rev=1.2&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ocaml-3.11.1.ebuild?r1=1.1&r2=1.2 |
| 45 |
|
| 46 |
Index: ocaml-3.11.1.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.1.ebuild,v |
| 49 |
retrieving revision 1.1 |
| 50 |
retrieving revision 1.2 |
| 51 |
diff -u -r1.1 -r1.2 |
| 52 |
--- ocaml-3.11.1.ebuild 15 Jun 2009 22:53:03 -0000 1.1 |
| 53 |
+++ ocaml-3.11.1.ebuild 20 Jun 2009 14:54:57 -0000 1.2 |
| 54 |
@@ -1,15 +1,17 @@ |
| 55 |
# Copyright 1999-2009 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.1.ebuild,v 1.1 2009/06/15 22:53:03 aballier Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.1.ebuild,v 1.2 2009/06/20 14:54:57 aballier Exp $ |
| 59 |
|
| 60 |
EAPI="1" |
| 61 |
|
| 62 |
inherit flag-o-matic eutils multilib versionator toolchain-funcs |
| 63 |
|
| 64 |
+PATCHLEVEL="1" |
| 65 |
MY_P="${P/_/+}" |
| 66 |
DESCRIPTION="Fast modern type-inferring functional programming language descended from the ML family" |
| 67 |
HOMEPAGE="http://www.ocaml.org/" |
| 68 |
-SRC_URI="ftp://ftp.inria.fr/INRIA/cristal/ocaml/ocaml-$( get_version_component_range 1-2)/${MY_P}.tar.gz" |
| 69 |
+SRC_URI="ftp://ftp.inria.fr/INRIA/cristal/ocaml/ocaml-$( get_version_component_range 1-2)/${MY_P}.tar.gz |
| 70 |
+ mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2" |
| 71 |
|
| 72 |
LICENSE="QPL-1.0 LGPL-2" |
| 73 |
SLOT="0" |
| 74 |
@@ -40,21 +42,7 @@ |
| 75 |
src_unpack() { |
| 76 |
unpack ${A} |
| 77 |
cd "${S}" |
| 78 |
- |
| 79 |
- # Fix the EXEC_STACK in ocaml compiled binaries (#153382) |
| 80 |
- epatch "${FILESDIR}"/${PN}-3.11.0_beta1-exec-stack-fixes.patch |
| 81 |
- |
| 82 |
- # The configure script doesn't inherit previous defined variables, |
| 83 |
- # overwriting previous declarations of bytecccompopts, bytecclinkopts, |
| 84 |
- # nativecccompopts and nativecclinkopts. Reported upstream as issue 0004267. |
| 85 |
- epatch "${FILESDIR}"/${PN}-3.11.0_beta1-configure.patch |
| 86 |
- |
| 87 |
- # ocaml has automagics on libX11 and gdbm |
| 88 |
- # http://caml.inria.fr/mantis/view.php?id=4278 |
| 89 |
- epatch "${FILESDIR}/${PN}-3.10.0-automagic.patch" |
| 90 |
- |
| 91 |
- # Respect LDFLAGS for ocamlyacc |
| 92 |
- epatch "${FILESDIR}"/${PN}-3.11.0_beta1-yaccldflags.patch |
| 93 |
+ EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" |
| 94 |
} |
| 95 |
|
| 96 |
src_compile() { |
Archives