diff options
| -rw-r--r-- | dev-lang/mercury/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-10.04.2-prepare-install-dir.patch | 11 | ||||
| -rw-r--r-- | dev-lang/mercury/mercury-10.04.2-r1.ebuild | 3 |
3 files changed, 19 insertions, 2 deletions
diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog index 2e7c80da4eb1..0c0ede79519f 100644 --- a/dev-lang/mercury/ChangeLog +++ b/dev-lang/mercury/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/mercury # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.122 2010/10/30 04:14:00 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.123 2010/10/31 00:02:59 keri Exp $ + + 31 Oct 2010; <keri@gentoo.org> mercury-10.04.2-r1.ebuild, + +files/mercury-10.04.2-prepare-install-dir.patch: + Ensure libgrade boehm_gc doesnt run automake called by mainter-mode. + Closes 30 Oct 2010; <keri@gentoo.org> mercury-10.04.2-r1.ebuild: QA - add die to do... function calls, add die to sed calls, remove die diff --git a/dev-lang/mercury/files/mercury-10.04.2-prepare-install-dir.patch b/dev-lang/mercury/files/mercury-10.04.2-prepare-install-dir.patch new file mode 100644 index 000000000000..b6740d5abb01 --- /dev/null +++ b/dev-lang/mercury/files/mercury-10.04.2-prepare-install-dir.patch @@ -0,0 +1,11 @@ +--- mercury-compiler-10.04.2.orig/scripts/prepare_install_dir.in 2010-02-24 20:04:42.000000000 +1300 ++++ mercury-compiler-10.04.2/scripts/prepare_install_dir.in 2010-10-31 12:50:11.000000000 +1300 +@@ -56,7 +56,7 @@ + cp boehm_gc/configure_atomic_ops.sh ${installdir}/boehm_gc + cp boehm_gc/build_atomic_ops.sh* ${installdir}/boehm_gc + cp -r boehm_gc/libatomic_ops-*[0-9] ${installdir}/boehm_gc +-cp -r boehm_gc/libatomic_ops ${installdir}/boehm_gc ++cp -pr boehm_gc/libatomic_ops ${installdir}/boehm_gc + cp -r boehm_gc/extra ${installdir}/boehm_gc + rm -fr ${installdir}/boehm_gc/libatomic_ops-*[0-9]/src/*.o + rm -fr ${installdir}/boehm_gc/libatomic_ops-*[0-9]/src/*.a diff --git a/dev-lang/mercury/mercury-10.04.2-r1.ebuild b/dev-lang/mercury/mercury-10.04.2-r1.ebuild index 0c8daef2efed..1a7615e76941 100644 --- a/dev-lang/mercury/mercury-10.04.2-r1.ebuild +++ b/dev-lang/mercury/mercury-10.04.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild,v 1.2 2010/10/30 04:14:00 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild,v 1.3 2010/10/31 00:02:59 keri Exp $ inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib @@ -38,6 +38,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-linker-flags.patch epatch "${FILESDIR}"/${P}-bootstrap-depend.patch epatch "${FILESDIR}"/${P}-default-grade.patch + epatch "${FILESDIR}"/${P}-prepare-install-dir.patch epatch "${FILESDIR}"/${P}-boehm_gc.patch epatch "${FILESDIR}"/${P}-sparc-llds-base-grade.patch epatch "${FILESDIR}"/${P}-char-det-from-int.patch |