| 1 |
keri 10/11/06 09:18:00 |
| 2 |
|
| 3 |
Modified: ChangeLog mercury-10.04.2-r1.ebuild |
| 4 |
Log: |
| 5 |
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 |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.127 dev-lang/mercury/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?rev=1.127&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?rev=1.127&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/ChangeLog?r1=1.126&r2=1.127 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v |
| 18 |
retrieving revision 1.126 |
| 19 |
retrieving revision 1.127 |
| 20 |
diff -u -r1.126 -r1.127 |
| 21 |
--- ChangeLog 3 Nov 2010 07:32:54 -0000 1.126 |
| 22 |
+++ ChangeLog 6 Nov 2010 09:18:00 -0000 1.127 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for dev-lang/mercury |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.126 2010/11/03 07:32:54 keri Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.127 2010/11/06 09:18:00 keri Exp $ |
| 28 |
+ |
| 29 |
+ 06 Nov 2010; <keri@g.o> mercury-10.04.2-r1.ebuild: |
| 30 |
+ Use 2-pass mercury_compiler bootstrap to allow patching .m files; closes |
| 31 |
+ #341793. Support building with MMAKE_USE_MMC_MAKE and GNU make 3.82 |
| 32 |
|
| 33 |
03 Nov 2010; <keri@g.o> mercury-10.04-r1.ebuild: |
| 34 |
Bundle patches into distfiles tarball. |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.5 dev-lang/mercury/mercury-10.04.2-r1.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild?rev=1.5&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild?rev=1.5&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild?r1=1.4&r2=1.5 |
| 43 |
|
| 44 |
Index: mercury-10.04.2-r1.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild,v |
| 47 |
retrieving revision 1.4 |
| 48 |
retrieving revision 1.5 |
| 49 |
diff -u -r1.4 -r1.5 |
| 50 |
--- mercury-10.04.2-r1.ebuild 3 Nov 2010 07:10:08 -0000 1.4 |
| 51 |
+++ mercury-10.04.2-r1.ebuild 6 Nov 2010 09:18:00 -0000 1.5 |
| 52 |
@@ -1,10 +1,10 @@ |
| 53 |
# Copyright 1999-2010 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $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 $ |
| 56 |
+# $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 $ |
| 57 |
|
| 58 |
inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib |
| 59 |
|
| 60 |
-PATCHSET_VER="0" |
| 61 |
+PATCHSET_VER="1" |
| 62 |
MY_P=${PN}-compiler-${PV} |
| 63 |
|
| 64 |
DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language" |
| 65 |
@@ -41,29 +41,15 @@ |
| 66 |
epatch "${WORKDIR}"/${PV} |
| 67 |
|
| 68 |
sed -i -e "s/@libdir@/$(get_libdir)/" \ |
| 69 |
- "${S}"/compiler/file_util.m \ |
| 70 |
- "${S}"/compiler/libs.file_util.c \ |
| 71 |
- "${S}"/compiler/make.program_target.m \ |
| 72 |
- "${S}"/compiler/make.program_target.c \ |
| 73 |
"${S}"/scripts/Mmake.vars.in \ |
| 74 |
|| die "sed libdir failed" |
| 75 |
|
| 76 |
- touch "${S}"/compiler/*.date |
| 77 |
- touch "${S}"/compiler/*.date0 |
| 78 |
- touch "${S}"/compiler/*.date3 |
| 79 |
- touch "${S}"/compiler/*.int |
| 80 |
- touch "${S}"/compiler/*.int0 |
| 81 |
- touch "${S}"/compiler/*.int2 |
| 82 |
- touch "${S}"/compiler/*.int3 |
| 83 |
- touch "${S}"/compiler/*.c_date |
| 84 |
- touch "${S}"/compiler/*.c |
| 85 |
- |
| 86 |
if use test; then |
| 87 |
epatch "${WORKDIR}"/${PV}-tests |
| 88 |
fi |
| 89 |
|
| 90 |
cd "${S}" |
| 91 |
- eautoreconf |
| 92 |
+ eautoconf |
| 93 |
} |
| 94 |
|
| 95 |
src_compile() { |
| 96 |
@@ -85,14 +71,27 @@ |
| 97 |
|
| 98 |
emake \ |
| 99 |
PARALLEL=${MAKEOPTS} \ |
| 100 |
- bootstrap_depend || die "emake depend failed" |
| 101 |
+ EXTRA_MLFLAGS=--no-strip \ |
| 102 |
+ EXTRA_LDFLAGS="${LDFLAGS}" \ |
| 103 |
+ EXTRA_LD_LIBFLAGS="${LDFLAGS}" \ |
| 104 |
+ || die "emake failed" |
| 105 |
+ |
| 106 |
+ EPATCH_FORCE=yes |
| 107 |
+ EPATCH_SUFFIX=patch |
| 108 |
+ epatch "${WORKDIR}"/${PV}-mmc |
| 109 |
+ |
| 110 |
+ sed -i -e "s/@libdir@/$(get_libdir)/" \ |
| 111 |
+ "${S}"/compiler/file_util.m \ |
| 112 |
+ "${S}"/compiler/make.program_target.m \ |
| 113 |
+ || die "sed libdir failed" |
| 114 |
|
| 115 |
emake \ |
| 116 |
PARALLEL=${MAKEOPTS} \ |
| 117 |
EXTRA_MLFLAGS=--no-strip \ |
| 118 |
EXTRA_LDFLAGS="${LDFLAGS}" \ |
| 119 |
EXTRA_LD_LIBFLAGS="${LDFLAGS}" \ |
| 120 |
- || die "emake failed" |
| 121 |
+ MERCURY_COMPILER="${S}"/compiler/mercury_compile \ |
| 122 |
+ compiler || die "emake compiler failed" |
| 123 |
|
| 124 |
emake \ |
| 125 |
PARALLEL=${MAKEOPTS} \ |
Archives