diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2008-11-14 13:20:55 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2008-11-14 13:20:55 +0000 |
| commit | ff07acb3a615d0b92d88609a01694cfacdd556b9 (patch) | |
| tree | bd2911a08354ee029d98e973b418fb8040b95a96 /dev-lang/ocaml | |
| parent | Sparc stable for Bug #245438, test passes but I have no way of using it. (diff) | |
| download | gentoo-2-ff07acb3a615d0b92d88609a01694cfacdd556b9.tar.gz gentoo-2-ff07acb3a615d0b92d88609a01694cfacdd556b9.tar.bz2 gentoo-2-ff07acb3a615d0b92d88609a01694cfacdd556b9.zip | |
respect ldflags for ocamlyacc
(Portage version: 2.2_rc14/cvs/Linux 2.6.27.5 x86_64)
Diffstat (limited to 'dev-lang/ocaml')
| -rw-r--r-- | dev-lang/ocaml/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/ocaml/files/ocaml-3.11.0_beta1-yaccldflags.patch | 13 | ||||
| -rw-r--r-- | dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild | 5 |
3 files changed, 22 insertions, 2 deletions
diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog index e94fe1852c66..0d41ddcd75f8 100644 --- a/dev-lang/ocaml/ChangeLog +++ b/dev-lang/ocaml/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/ocaml # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.151 2008/11/07 09:59:10 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.152 2008/11/14 13:20:55 aballier Exp $ + + 14 Nov 2008; Alexis Ballier <aballier@gentoo.org> + +files/ocaml-3.11.0_beta1-yaccldflags.patch, ocaml-3.11.0_beta1.ebuild: + respect ldflags for ocamlyacc 07 Nov 2008; Alexis Ballier <aballier@gentoo.org> -files/ocaml-3.11.0_beta1-call-ld-with-proper-ldflags.patch, diff --git a/dev-lang/ocaml/files/ocaml-3.11.0_beta1-yaccldflags.patch b/dev-lang/ocaml/files/ocaml-3.11.0_beta1-yaccldflags.patch new file mode 100644 index 000000000000..b3dd1ea38126 --- /dev/null +++ b/dev-lang/ocaml/files/ocaml-3.11.0_beta1-yaccldflags.patch @@ -0,0 +1,13 @@ +Index: ocaml-3.11.0+beta1/yacc/Makefile +=================================================================== +--- ocaml-3.11.0+beta1.orig/yacc/Makefile ++++ ocaml-3.11.0+beta1/yacc/Makefile +@@ -25,7 +25,7 @@ OBJS= closure.o error.o lalr.o lr0.o mai + all: ocamlyacc$(EXE) + + ocamlyacc$(EXE): $(OBJS) +- $(CC) $(CFLAGS) $(CCLINKFLAGS) -o ocamlyacc $(OBJS) ++ $(CC) $(LDFLAGS) $(CFLAGS) $(CCLINKFLAGS) -o ocamlyacc $(OBJS) + + version.h : ../VERSION + echo "#define OCAML_VERSION \"`head -1 ../VERSION`\"" >version.h diff --git a/dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild b/dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild index 063188478699..1e10ce9f9f60 100644 --- a/dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild +++ b/dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild,v 1.2 2008/11/07 09:59:10 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild,v 1.3 2008/11/14 13:20:55 aballier Exp $ inherit flag-o-matic eutils multilib versionator toolchain-funcs @@ -51,6 +51,9 @@ src_unpack() { # ocaml has automagics on libX11 and gdbm # http://caml.inria.fr/mantis/view.php?id=4278 epatch "${FILESDIR}/${PN}-3.10.0-automagic.patch" + + # Respect LDFLAGS for ocamlyacc + epatch "${FILESDIR}"/${PN}-3.11.0_beta1-yaccldflags.patch } src_compile() { |