diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-08-19 19:37:02 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-08-19 19:37:02 +0000 |
| commit | 90524cf19bbb36ce18e67b0bebcd6c1bef083b1b (patch) | |
| tree | 3058cd61ee411f5a9339bb8deb1c1f8643d9fa13 /dev-ml/batteries | |
| parent | amd64/x86 stable wrt bug #449596 (diff) | |
| download | gentoo-2-90524cf19bbb36ce18e67b0bebcd6c1bef083b1b.tar.gz gentoo-2-90524cf19bbb36ce18e67b0bebcd6c1bef083b1b.tar.bz2 gentoo-2-90524cf19bbb36ce18e67b0bebcd6c1bef083b1b.zip | |
Add fix from upstream to build with ocaml 4.01
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'dev-ml/batteries')
| -rw-r--r-- | dev-ml/batteries/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-ml/batteries/batteries-2.1.ebuild | 3 | ||||
| -rw-r--r-- | dev-ml/batteries/files/batteries-2.1-ocaml-4.01.patch | 21 |
3 files changed, 28 insertions, 2 deletions
diff --git a/dev-ml/batteries/ChangeLog b/dev-ml/batteries/ChangeLog index 229e3cf86eb6..6607ea137903 100644 --- a/dev-ml/batteries/ChangeLog +++ b/dev-ml/batteries/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-ml/batteries # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/batteries/ChangeLog,v 1.9 2013/08/16 23:03:59 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ml/batteries/ChangeLog,v 1.10 2013/08/19 19:37:02 aballier Exp $ + + 19 Aug 2013; Alexis Ballier <aballier@gentoo.org> batteries-2.1.ebuild, + +files/batteries-2.1-ocaml-4.01.patch: + Add fix from upstream to build with ocaml 4.01 16 Aug 2013; Alexis Ballier <aballier@gentoo.org> -batteries-1.5.0.ebuild: remove old diff --git a/dev-ml/batteries/batteries-2.1.ebuild b/dev-ml/batteries/batteries-2.1.ebuild index 2d76917b38f0..46ffdacf97bf 100644 --- a/dev-ml/batteries/batteries-2.1.ebuild +++ b/dev-ml/batteries/batteries-2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/batteries/batteries-2.1.ebuild,v 1.1 2013/07/22 01:00:49 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ml/batteries/batteries-2.1.ebuild,v 1.2 2013/08/19 19:37:02 aballier Exp $ EAPI=5 @@ -20,3 +20,4 @@ DEPEND="${RDEPEND} test? ( dev-ml/ounit dev-ml/iTeML )" DOCS=( "ChangeLog" "FAQ" "README.folders" "README.md" ) +PATCHES=( "${FILESDIR}/${P}-ocaml-4.01.patch" ) diff --git a/dev-ml/batteries/files/batteries-2.1-ocaml-4.01.patch b/dev-ml/batteries/files/batteries-2.1-ocaml-4.01.patch new file mode 100644 index 000000000000..49194794e967 --- /dev/null +++ b/dev-ml/batteries/files/batteries-2.1-ocaml-4.01.patch @@ -0,0 +1,21 @@ +commit 1db918c5966c6f95dda9b2c4c26975b0a8fddb2c +Author: Gabriel Scherer <gabriel.scherer@gmail.com> +Date: Thu Aug 8 11:59:49 2013 +0200 + + Add the new O_CLOEXEC flag to Unix.open_flag in version 4.1 + +diff --git a/src/batUnix.mliv b/src/batUnix.mliv +index bd710a7..943db0a 100644 +--- a/src/batUnix.mliv ++++ b/src/batUnix.mliv +@@ -261,6 +261,10 @@ type open_flag = Unix.open_flag = + O_SYNC/O_DSYNC) *) + ##V4## | O_SHARE_DELETE (** OCaml 4 and Windows only: allow the file to be deleted + ##V4## while still open *) ++##V4.1## | O_CLOEXEC (** Set the close-on-exec flag on the ++##V4.1## descriptor returned by {!openfile} ++##V4.1## ++##V4.1## Since OCaml 4.1 *) + (** The flags to {!Unix.openfile}. *) + + |