diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2009-11-27 09:27:42 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2009-11-27 09:27:42 +0000 |
| commit | e946ff1805130ac7179d8c1a1fcb4cf62a44ce2f (patch) | |
| tree | fcf997b15371e04e57b60d0275edaec16aca6223 /dev-ml | |
| parent | Initial ebuild by me. (diff) | |
| download | gentoo-2-e946ff1805130ac7179d8c1a1fcb4cf62a44ce2f.tar.gz gentoo-2-e946ff1805130ac7179d8c1a1fcb4cf62a44ce2f.tar.bz2 gentoo-2-e946ff1805130ac7179d8c1a1fcb4cf62a44ce2f.zip | |
dont build with ocamlc -annot since it appeared in ocaml 3.11, reported by Fauli
(Portage version: 2.2_rc52/cvs/Linux x86_64)
Diffstat (limited to 'dev-ml')
| -rw-r--r-- | dev-ml/camlimages/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-ml/camlimages/camlimages-3.0.2.ebuild | 3 | ||||
| -rw-r--r-- | dev-ml/camlimages/files/camlimages-3.0.2-annot.patch | 13 |
3 files changed, 21 insertions, 2 deletions
diff --git a/dev-ml/camlimages/ChangeLog b/dev-ml/camlimages/ChangeLog index 659b09b89e12..104bd73a7cd1 100644 --- a/dev-ml/camlimages/ChangeLog +++ b/dev-ml/camlimages/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-ml/camlimages # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.20 2009/11/25 17:10:35 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.21 2009/11/27 09:27:42 aballier Exp $ + + 27 Nov 2009; Alexis Ballier <aballier@gentoo.org> camlimages-3.0.2.ebuild, + +files/camlimages-3.0.2-annot.patch: + dont build with ocamlc -annot since it appeared in ocaml 3.11, reported by + Fauli *camlimages-3.0.2 (25 Nov 2009) diff --git a/dev-ml/camlimages/camlimages-3.0.2.ebuild b/dev-ml/camlimages/camlimages-3.0.2.ebuild index b8fcd2186742..33e6a7f580e6 100644 --- a/dev-ml/camlimages/camlimages-3.0.2.ebuild +++ b/dev-ml/camlimages/camlimages-3.0.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-3.0.2.ebuild,v 1.1 2009/11/25 17:10:35 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-3.0.2.ebuild,v 1.2 2009/11/27 09:27:42 aballier Exp $ EAPI=2 @@ -33,6 +33,7 @@ DEPEND="${DEPEND} src_prepare() { epatch "${FILESDIR}/${P}-tiffread-CVE-2009-3296.patch" epatch "${FILESDIR}/${P}-ocaml-autoconf11.patch" + epatch "${FILESDIR}/${P}-annot.patch" eautoreconf } diff --git a/dev-ml/camlimages/files/camlimages-3.0.2-annot.patch b/dev-ml/camlimages/files/camlimages-3.0.2-annot.patch new file mode 100644 index 000000000000..b34962f12ce2 --- /dev/null +++ b/dev-ml/camlimages/files/camlimages-3.0.2-annot.patch @@ -0,0 +1,13 @@ +Index: camlimages-3.0.2/src/Makefile.am +=================================================================== +--- camlimages-3.0.2.orig/src/Makefile.am ++++ camlimages-3.0.2/src/Makefile.am +@@ -35,7 +35,7 @@ endif + + BUILT_SOURCES = $(OCAMLBUILTSOURCES) + +-OCAMLCFLAGS = -warn-error A -annot ++OCAMLCFLAGS = -warn-error A + LINKFLAGS = + AM_OCAMLCFLAGS = + AM_CFLAGS = -I .. -DHAVE_CONFIG_H |