diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2012-10-10 12:16:12 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2012-10-10 12:16:12 +0000 |
| commit | 82e28c413fbf1b2e1bc90489469c5aa061d80c26 (patch) | |
| tree | c53482920bbf0233f17dc3566d6a23619dfa0256 /dev-ml | |
| parent | QA: add missing RDEPEND and 'die' statements (diff) | |
| download | historical-82e28c413fbf1b2e1bc90489469c5aa061d80c26.tar.gz historical-82e28c413fbf1b2e1bc90489469c5aa061d80c26.tar.bz2 historical-82e28c413fbf1b2e1bc90489469c5aa061d80c26.zip | |
fix build with ocaml-4
Package-Manager: portage-2.2.0_alpha136/cvs/Linux x86_64
Diffstat (limited to 'dev-ml')
| -rw-r--r-- | dev-ml/fort/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-ml/fort/Manifest | 15 | ||||
| -rw-r--r-- | dev-ml/fort/files/fort-0.4.2-ocaml4.patch | 22 | ||||
| -rw-r--r-- | dev-ml/fort/fort-0.4.2.ebuild | 7 |
4 files changed, 45 insertions, 7 deletions
diff --git a/dev-ml/fort/ChangeLog b/dev-ml/fort/ChangeLog index 797dae03f05f..07d89d790d81 100644 --- a/dev-ml/fort/ChangeLog +++ b/dev-ml/fort/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-ml/fort -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/fort/ChangeLog,v 1.4 2011/02/12 16:01:46 xarthisius Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ml/fort/ChangeLog,v 1.5 2012/10/10 12:16:04 aballier Exp $ + + 10 Oct 2012; Alexis Ballier <aballier@gentoo.org> fort-0.4.2.ebuild, + +files/fort-0.4.2-ocaml4.patch: + fix build with ocaml-4 12 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org> fort-0.4.2.ebuild: Marked ~ppc wrt #322673 diff --git a/dev-ml/fort/Manifest b/dev-ml/fort/Manifest index d25b064ed6e0..c70c78a097e1 100644 --- a/dev-ml/fort/Manifest +++ b/dev-ml/fort/Manifest @@ -1,4 +1,15 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX fort-0.4.2-ocaml4.patch 648 SHA256 0f197ad20e8b19477c71178f2204dc5609758079b8d1243bea5b71ae19f6e985 SHA512 e52bc74d890f4adcc767eb58e006f18b0a510b33ed1b056e6d0c9ef8716e2278b9a45e9f3c988d0dcd02e117fa4030e57b23402cc4e1e58319b062f7dce609f3 WHIRLPOOL 9719197acc5aeb56128004cb228e2cc7e97702e3abbbdd0adaec7455ca6b0d771e137c98aed8be0f1de643280409998db6c14647e4dd9b8afd3dd1743cef0b38 DIST fort-0.4.2.tar.gz 6828 SHA256 171ddc85901f897cd1c47d6ef04f16b011673cd0f06e7d57cfa95688879192e7 SHA512 59659bcc885f8d71985121a2abcfef756078eb472cadbd74ff97aef3378cd3f2a2a6da3a41a0a015b3175c18d98775e7f6b26c7a76262eb044b25122679c15a8 WHIRLPOOL 980a10c89b3734fd4e5ed9ae42b5ab80deffb545a6b06aec4385a7389bcfb6eb01b9c1dbe8affb0fe3280a552f2dda1c7560b8abc9490e0a447d43f2d07ca433 -EBUILD fort-0.4.2.ebuild 807 SHA256 162cd1dcd1bd3b43d5303ea9e76442dd6171563942f031d1389a1986a07405e6 SHA512 1f68ea861282461164746f35a4cd142eda52a4a46806de7506a8442bcecba2f64e12c69f63e447c631a7c1cb4295e4f896af47e02f54d4c6552ef5eca8d9efc9 WHIRLPOOL 8de8e28edeb20e7392f46c98a3cbd6f12881c8d9dd9166eacf13dd6fe06b395851a7a78e36c3d4cf1e50590db6a8d80fe0679332523bf6f316188482fe4320d4 -MISC ChangeLog 666 SHA256 b6718dff78c6519982d8404f724017600320799b87237e7d530f83f460a282b2 SHA512 a6451efc72f89877fc21bd8592c5ef543da4cb0b0a1ed4cffc826eb429e217b81c20bb47f30cdd36e153b1c7c339ca1202e28850ef630854ce98fbdad439aedd WHIRLPOOL 04955cb4be875e07f8ac31bcc6eeb5ccc44a4af9f366aa3128879dfb0ff340ea1b72b7e540c0fab542635cdd5fd9e173a7d7633efbca4368af94eee79ae5a4fc +EBUILD fort-0.4.2.ebuild 888 SHA256 4383a654c5ebcb0c072ef3e8773445afe3789204f753e6e0bc8dfc602cc2913a SHA512 0c22c1f6ee249a99da484bb19cee7ed46115d9cf27595e04a1125f68440a06e8ce69d31a86ce0135c29a19f30cc3a1d3e764245d846e6e04a25356c08ddc8644 WHIRLPOOL d698b4af38b0dc16c355f64f09e32e062f2f6e90ee5c3c4ae6220dfdd42191aa8e42c677d5d8242d6feccc2306bef7489c6a9aca9f8cd7cb85a6d68246cc6fa8 +MISC ChangeLog 795 SHA256 df4bc7e10ace98a9a271f4ff35048720798e10e090b312dfeb9d7a2e55ce02ef SHA512 99c68ebf9e5926b4d22efcafbc4c2c3670643961ebb37994a8e25525870440668653f301c592eae7bb75bc9838987b5ec55a320e7c57249e5d93f18de00f3924 WHIRLPOOL 067b345ef45e3d1061d10f9bde64e121074e031da42d289f6a9bc080ba38b31d0fc0ec49b0d712b725500da7df032ee33403dce119d3c477a3310f705950cc2d MISC metadata.xml 400 SHA256 231013f1053b23a4999ac9e20f6839fe5f70cc4d8a36428496b56d577a5fdc73 SHA512 50eeb7637f173bbff96a192a304bacc3a8971affefc5336dcada64f7542aba4344b5fdc1caac686c71fab57f6f66e7bd70ced4e7c9544b3645dc5d8c3b3889df WHIRLPOOL e224c6533418eeccb336ed9ffeacd34e5315d2ba01f844b0da0baa7bbf2571ed8f0dd714fb7e6f979fa964b912b67266de268b97185425484fe9ae9feedef7ab +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iEYEAREIAAYFAlB1ZwYACgkQvFcC4BYPU0rwHQCeINRxqPsyHDnOmT0RHozIEC75 +bbcAn0X1WtKPADuk/WV6Rc6y+13huCU6 +=W1yW +-----END PGP SIGNATURE----- diff --git a/dev-ml/fort/files/fort-0.4.2-ocaml4.patch b/dev-ml/fort/files/fort-0.4.2-ocaml4.patch new file mode 100644 index 000000000000..1c688a995446 --- /dev/null +++ b/dev-ml/fort/files/fort-0.4.2-ocaml4.patch @@ -0,0 +1,22 @@ +Index: fort-0.4.2/Makefile +=================================================================== +--- fort-0.4.2.orig/Makefile ++++ fort-0.4.2/Makefile +@@ -3,7 +3,7 @@ + + include Makefile.config + +-OCAMLC := ocamlc ++OCAMLC := ocamlc -I +compiler-libs + + # FORT top-level interpreter + NAME := fort +@@ -16,7 +16,7 @@ LIBS := unix + EXECUTABLE := $(NAME)$(EXEC_SUFFIX) + + $(EXECUTABLE): $(OBJECTS) +- $(OCAMLC) -linkall -o $@ toplevellib.cma $(LIBS:%=%.cma) $(OBJECTS) ++ $(OCAMLC) -linkall -o $@ ocamlcommon.cma ocamlbytecomp.cma ocamltoplevel.cma $(LIBS:%=%.cma) $(OBJECTS) + + install: $(EXECUTABLE) $(OBJECTS) + mkdir -p $(DESTDIR)$(LIBDIR) diff --git a/dev-ml/fort/fort-0.4.2.ebuild b/dev-ml/fort/fort-0.4.2.ebuild index d826304b42f6..220575f441b1 100644 --- a/dev-ml/fort/fort-0.4.2.ebuild +++ b/dev-ml/fort/fort-0.4.2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/fort/fort-0.4.2.ebuild,v 1.4 2011/02/12 16:01:46 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ml/fort/fort-0.4.2.ebuild,v 1.5 2012/10/10 12:16:04 aballier Exp $ EAPI=2 -inherit multilib +inherit multilib eutils DESCRIPTION="provides an environment for testing programs and Objective Caml modules" HOMEPAGE="http://fort.sourceforge.net/" @@ -19,6 +19,7 @@ DEPEND="dev-lang/ocaml" RDEPEND="${DEPEND}" src_prepare() { + has_version '>=dev-lang/ocaml-4' && epatch "${FILESDIR}/${P}-ocaml4.patch" sed -i -e "s:\$(BINDIR):\$(DESTDIR)&:"\ -e "s:\$(LIBDIR):\$(DESTDIR)&:" Makefile || die } |