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 | 360d5683b7a714cdd544af9ca86a900702f564a4 (patch) | |
| tree | 536c919289e8b6b0c3cfe2ba37b3319f563d3090 /dev-lang | |
| parent | Sparc stable for Bug #245438, test passes but I have no way of using it. (diff) | |
| download | historical-360d5683b7a714cdd544af9ca86a900702f564a4.tar.gz historical-360d5683b7a714cdd544af9ca86a900702f564a4.tar.bz2 historical-360d5683b7a714cdd544af9ca86a900702f564a4.zip | |
respect ldflags for ocamlyacc
Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27.5 x86_64
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/ocaml/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/ocaml/Manifest | 11 | ||||
| -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 |
4 files changed, 28 insertions, 7 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/Manifest b/dev-lang/ocaml/Manifest index 9a58789502df..4cae3e13e651 100644 --- a/dev-lang/ocaml/Manifest +++ b/dev-lang/ocaml/Manifest @@ -8,19 +8,20 @@ AUX ocaml-3.10.0-exec-stack-fixes.patch 9395 RMD160 00d5e1ac85a090baeaf9b9cba2e2 AUX ocaml-3.10.2-tk85.patch 2414 RMD160 1b8dc94de1c90264684a300f5f31ffce02e94cec SHA1 98c7a48c167500d3e7d8c34e79124dc0cedc315d SHA256 ba539578fbec539ff481b5fc786612d5e85b01cc2d6eee22a2f9ed340d2d0fd3 AUX ocaml-3.11.0_beta1-configure.patch 1250 RMD160 d34fbe9b23aedfc7c1bee1176b3b172f2da6790a SHA1 5d8cdecd30ec8d32c28882d2bd2e8fb1895cd1c4 SHA256 27350000be48d687440eb69526504d0a3c422623a305da671f8b94b1526be0b4 AUX ocaml-3.11.0_beta1-exec-stack-fixes.patch 7262 RMD160 1a3d125b775494bf8e0f8d9b85edb101447d5756 SHA1 a0f762f089679f8f273ea0e44998a9c5e364ded7 SHA256 e8d7cded5ebc494df8be81764e80982cba0192d1e010472690ccff75e5d0e03b +AUX ocaml-3.11.0_beta1-yaccldflags.patch 508 RMD160 d89f899db37f5f469f42c750a972683a640d71f1 SHA1 508863141631669712f40df185a87b85434ee7bd SHA256 7396a13d80ab691f59a9e60fa93355c869245f6944e9b2d49cb0c4bce7816117 AUX ocaml-rebuild.sh 1253 RMD160 c9a261dc50239cb3cf8ee890bf0fa314903421d9 SHA1 7cfe5d413de41b1ae3761903549c6cb9af9b02b2 SHA256 99abe161795c6b6c7b4a180e3cc850fee2d175f9123858883ae181cc96851cae DIST ocaml-3.08.4.tar.bz2 2054019 RMD160 448ed9af56cacb9c32208d064e1c9732a2086bd2 SHA1 d9eb54611d24f9e1c33736f12c7ba87412057cbb SHA256 8d4322791d0dd424f355636ba50934ac17dbefde269736dad0da0683c8888684 DIST ocaml-3.10.2.tar.bz2 2284860 RMD160 f631230b090dbd9bf9a9f71631cd0347c033cbb1 SHA1 f604580bf2943891d8faf265eeb900bbe90abce0 SHA256 3755a32da1a7490d47fff7838c12c754d3fcfe69d7c9ff2358704259dc477c58 DIST ocaml-3.11.0+beta1.tar.bz2 2366506 RMD160 bf5e0b6c2346b29ba43a23ac5603c0f09cef2080 SHA1 2d903961dc802d10ad0e07e3e9a44b425e66307b SHA256 a4190b6373d99b98c10fda82057b68785da13e76e141d55e6bfcb937d1956234 EBUILD ocaml-3.08.4.ebuild 2532 RMD160 4f76d197232320e0450b7c847dc0006c10ff165b SHA1 4ca95ee897d20abb813855194fbd3206baff5813 SHA256 8d0dfe01e1186149e6e545d8227796b6e7976c6d3e6cc04aa8262c3d574ef252 EBUILD ocaml-3.10.2.ebuild 4446 RMD160 79c3b1bfbfccb7ea3823f8d7f36f9b2280392d5a SHA1 43fabdb80ac1ba267f964a39ba07bc8d208d8c5a SHA256 27680e3e8e19e88e1ea35594771fca0494d5d5b69a515e5a738a743963b0949a -EBUILD ocaml-3.11.0_beta1.ebuild 4098 RMD160 b64ffe46935335653e8afeb29d6087dfb42a9812 SHA1 b9baf6b656aeb08e79b2e3a3d3270e6c36e183de SHA256 eae143319e5b901e3ebb1938e41134fb08a3fa20c1c5b292abcc9d54714f1e94 -MISC ChangeLog 24020 RMD160 b15e923124dbb231dafa7ae6f1901f7123ee0acb SHA1 b3edb53c5f9d3f8cae76733607513deafb26911c SHA256 688232d1dcd9268568886a58de56cc2878a19bbf1fe7254015d02eea8524dba1 +EBUILD ocaml-3.11.0_beta1.ebuild 4191 RMD160 5565a26a829d242760d5b3051051501a34adf029 SHA1 599500d6fe7b59703e175c59c5d2ae92ac8251de SHA256 58e4cf983da856a57c2e3f961ac90ea1b102e4f151ab7ad73e5d4c0795421fa3 +MISC ChangeLog 24179 RMD160 39dea1d2d8420f9a6a76d905dcb4d0a3e697f3b7 SHA1 68c90fb1b1f2abba56715c80cd92025c1491d02d SHA256 4debe94908dc66314aaab8f08e41bf0c46cafb62ac37d2df927f9b1554f98b7d MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkkUEXQACgkQvFcC4BYPU0qeFQCgtj3pPGyjogJIZCXkE1PmKIVO -LlQAoMMBBmSNqCrtHR220KAea2VLcUAp -=tURc +iEYEARECAAYFAkkdezwACgkQvFcC4BYPU0rsdACgq4RYDrvpGBKT5hGCOFiDHEfO +Mt8AoJ8uCnJZLklf/XZlzCYUncPzm4uH +=6eLm -----END PGP SIGNATURE----- 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() { |