diff options
| author |   Keri Harris <keri@gentoo.org> | 2010-11-06 09:18:00 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2010-11-06 09:18:00 +0000 |
| commit | b471d76d2cda63883b1b65875ebce9c78562dcd2 (patch) | |
| tree | 994dacd0c5c1ce0fdf2a1502c6440d8ad31c92a7 /dev-lang/mercury | |
| parent | old (diff) | |
| download | gentoo-2-b471d76d2cda63883b1b65875ebce9c78562dcd2.tar.gz gentoo-2-b471d76d2cda63883b1b65875ebce9c78562dcd2.tar.bz2 gentoo-2-b471d76d2cda63883b1b65875ebce9c78562dcd2.zip | |
Use 2-pass mercury_compiler bootstrap to allow patching .m files; closes #341793. Support building with MMAKE_USE_MMC_MAKE and GNU make 3.82
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/mercury')
| -rw-r--r-- | dev-lang/mercury/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/mercury/mercury-10.04.2-r1.ebuild | 37 |
2 files changed, 23 insertions, 20 deletions
diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog index e0eb7ce1f039..c48d1e17dbaa 100644 --- a/dev-lang/mercury/ChangeLog +++ b/dev-lang/mercury/ChangeLog @@ -1,6 +1,10 @@ # 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.126 2010/11/03 07:32:54 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.127 2010/11/06 09:18:00 keri Exp $ + + 06 Nov 2010; <keri@gentoo.org> mercury-10.04.2-r1.ebuild: + Use 2-pass mercury_compiler bootstrap to allow patching .m files; closes + #341793. Support building with MMAKE_USE_MMC_MAKE and GNU make 3.82 03 Nov 2010; <keri@gentoo.org> mercury-10.04-r1.ebuild: Bundle patches into distfiles tarball. diff --git a/dev-lang/mercury/mercury-10.04.2-r1.ebuild b/dev-lang/mercury/mercury-10.04.2-r1.ebuild index 4613b4f01346..430940e13e6b 100644 --- a/dev-lang/mercury/mercury-10.04.2-r1.ebuild +++ b/dev-lang/mercury/mercury-10.04.2-r1.ebuild @@ -1,10 +1,10 @@ # 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.4 2010/11/03 07:10:08 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild,v 1.5 2010/11/06 09:18:00 keri Exp $ inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib -PATCHSET_VER="0" +PATCHSET_VER="1" MY_P=${PN}-compiler-${PV} DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language" @@ -41,29 +41,15 @@ src_unpack() { epatch "${WORKDIR}"/${PV} sed -i -e "s/@libdir@/$(get_libdir)/" \ - "${S}"/compiler/file_util.m \ - "${S}"/compiler/libs.file_util.c \ - "${S}"/compiler/make.program_target.m \ - "${S}"/compiler/make.program_target.c \ "${S}"/scripts/Mmake.vars.in \ || die "sed libdir failed" - touch "${S}"/compiler/*.date - touch "${S}"/compiler/*.date0 - touch "${S}"/compiler/*.date3 - touch "${S}"/compiler/*.int - touch "${S}"/compiler/*.int0 - touch "${S}"/compiler/*.int2 - touch "${S}"/compiler/*.int3 - touch "${S}"/compiler/*.c_date - touch "${S}"/compiler/*.c - if use test; then epatch "${WORKDIR}"/${PV}-tests fi cd "${S}" - eautoreconf + eautoconf } src_compile() { @@ -85,14 +71,27 @@ src_compile() { emake \ PARALLEL=${MAKEOPTS} \ - bootstrap_depend || die "emake depend failed" + EXTRA_MLFLAGS=--no-strip \ + EXTRA_LDFLAGS="${LDFLAGS}" \ + EXTRA_LD_LIBFLAGS="${LDFLAGS}" \ + || die "emake failed" + + EPATCH_FORCE=yes + EPATCH_SUFFIX=patch + epatch "${WORKDIR}"/${PV}-mmc + + sed -i -e "s/@libdir@/$(get_libdir)/" \ + "${S}"/compiler/file_util.m \ + "${S}"/compiler/make.program_target.m \ + || die "sed libdir failed" emake \ PARALLEL=${MAKEOPTS} \ EXTRA_MLFLAGS=--no-strip \ EXTRA_LDFLAGS="${LDFLAGS}" \ EXTRA_LD_LIBFLAGS="${LDFLAGS}" \ - || die "emake failed" + MERCURY_COMPILER="${S}"/compiler/mercury_compile \ + compiler || die "emake compiler failed" emake \ PARALLEL=${MAKEOPTS} \ |