From: Keri Harris <keri@gentoo.org>
Date: Sat, 30 Dec 2006 01:32:43 +0000 (+0000)
Subject: Enable the mercury deep-profiler.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=421e1c03ee5ab0e93ad31ad38eac144eca27b6d7;p=gentoo.git

Enable the mercury deep-profiler.
Package-Manager: portage-2.1.2_rc4-r2
---

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 9044a083aca6..7af89ef6444a 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/mercury
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.65 2006/12/04 08:43:45 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.66 2006/12/30 01:32:43 keri Exp $
+
+*mercury-0.12.2-r4 (30 Dec 2006)
+
+  30 Dec 2006; keri <keri@gentoo.org>
+  +files/mercury-0.12.2-profdeep-builtin_throw.patch,
+  +mercury-0.12.2-r4.ebuild:
+  Enable the mercury deep-profiler.
 
 *mercury-0.13.1 (04 Dec 2006)
 
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index b11d8ad808f3..7f41560b0b48 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -38,6 +38,10 @@ AUX mercury-0.12.2-portage-r3.patch 3249 RMD160 f49a3e173a2dab1af7d4c79c1333394e
 MD5 d3f01dd8c7dd87f6e398d43d85c683db files/mercury-0.12.2-portage-r3.patch 3249
 RMD160 f49a3e173a2dab1af7d4c79c1333394e99fe1926 files/mercury-0.12.2-portage-r3.patch 3249
 SHA256 1fa09fe1f88ba05e4f0408bc8dd121b6daddb95ad873171ae15bc070771d2634 files/mercury-0.12.2-portage-r3.patch 3249
+AUX mercury-0.12.2-profdeep-builtin_throw.patch 559 RMD160 026d3cd80847f0aa8bbf5d717513f4e59f2abed7 SHA1 6eb92781413e01d90d65358778ddf59ec31b4103 SHA256 2280f2eceba9aba706987e2475415df0724da633cf69f7484995162527b81909
+MD5 6881f16895d02508cc05cbf0ba92881f files/mercury-0.12.2-profdeep-builtin_throw.patch 559
+RMD160 026d3cd80847f0aa8bbf5d717513f4e59f2abed7 files/mercury-0.12.2-profdeep-builtin_throw.patch 559
+SHA256 2280f2eceba9aba706987e2475415df0724da633cf69f7484995162527b81909 files/mercury-0.12.2-profdeep-builtin_throw.patch 559
 AUX mercury-0.12.2-tests.patch 7502 RMD160 88e9a509c696bb32d7982708261685a602322070 SHA1 bf4bda5139ee91bac25a0b77bb228320abaedab3 SHA256 8895bb246d111c3c09b309f3332a42f6bc3b6ea1f96f56537c2ccd2f82ac362f
 MD5 cdfafee8cc55f364644e65a4fc841b1c files/mercury-0.12.2-tests.patch 7502
 RMD160 88e9a509c696bb32d7982708261685a602322070 files/mercury-0.12.2-tests.patch 7502
@@ -136,6 +140,10 @@ EBUILD mercury-0.12.2-r3.ebuild 3450 RMD160 99593c2d1e4112caa5f880a3fa28931a7ec7
 MD5 181fbbca5d6184eafcf27c498245e199 mercury-0.12.2-r3.ebuild 3450
 RMD160 99593c2d1e4112caa5f880a3fa28931a7ec700d3 mercury-0.12.2-r3.ebuild 3450
 SHA256 3ab81255629af07fd28f594e335ac868cab5cf0e1c5ec668048da405aa82b5ac mercury-0.12.2-r3.ebuild 3450
+EBUILD mercury-0.12.2-r4.ebuild 3506 RMD160 5948e2baaf2fb637e7adf082747bd8b71a5fb0e4 SHA1 45edf63b132d92c0703721160e3104c9bacf394f SHA256 f36ef7a6777894c782604bae7b08b80bc17149d4b020b4f5965b62592174ba19
+MD5 3794c54267d1926b9a12f925e27f3cc9 mercury-0.12.2-r4.ebuild 3506
+RMD160 5948e2baaf2fb637e7adf082747bd8b71a5fb0e4 mercury-0.12.2-r4.ebuild 3506
+SHA256 f36ef7a6777894c782604bae7b08b80bc17149d4b020b4f5965b62592174ba19 mercury-0.12.2-r4.ebuild 3506
 EBUILD mercury-0.13.0.ebuild 3399 RMD160 24b4653ef73193e0de4d95d85a0aa7f589510f47 SHA1 01af1c835211afcdaedc253f718f5602d162ae28 SHA256 edf43ee4d3ca5cc66da22b7eac76f153017f8c1f453bdc8459067d7ab8b64f5a
 MD5 b1c1a96d2f9339b78e135b1a8a06d5a3 mercury-0.13.0.ebuild 3399
 RMD160 24b4653ef73193e0de4d95d85a0aa7f589510f47 mercury-0.13.0.ebuild 3399
@@ -144,10 +152,10 @@ EBUILD mercury-0.13.1.ebuild 3346 RMD160 dd731ac257203aca48294fa67b9bdee4c636e6a
 MD5 f34187bbf12011057168c2a7583fff5c mercury-0.13.1.ebuild 3346
 RMD160 dd731ac257203aca48294fa67b9bdee4c636e6ab mercury-0.13.1.ebuild 3346
 SHA256 a27a34005f45e378df82bbad8409c9c8c30d253362982f9ebdcd5db883f66a7f mercury-0.13.1.ebuild 3346
-MISC ChangeLog 12219 RMD160 e27a817e6cc01e1ff9474668a76acee9aa45fbc7 SHA1 7c0e3209793596793d99a4ad6b3e0177e21730be SHA256 40138a1880aefa9b300af9c38f7fed84bdd698de67556bab139846d9bd7c13e9
-MD5 7e1d3a0cf2a8217450f3326f235e3766 ChangeLog 12219
-RMD160 e27a817e6cc01e1ff9474668a76acee9aa45fbc7 ChangeLog 12219
-SHA256 40138a1880aefa9b300af9c38f7fed84bdd698de67556bab139846d9bd7c13e9 ChangeLog 12219
+MISC ChangeLog 12411 RMD160 030ab49cf771b3dd41f0017c695558d0df4de5a4 SHA1 c5b78f1ea5d4933f1c0418b075796fc75244a087 SHA256 4efc62454cf546edf0fcb53f818f7892e4970e68183a1ee5514c2ee7339062e5
+MD5 d9b4eaaa3017414135d911e5ba43d104 ChangeLog 12411
+RMD160 030ab49cf771b3dd41f0017c695558d0df4de5a4 ChangeLog 12411
+SHA256 4efc62454cf546edf0fcb53f818f7892e4970e68183a1ee5514c2ee7339062e5 ChangeLog 12411
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
 MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247
 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247
@@ -155,6 +163,9 @@ SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa metadata
 MD5 0d30492cc04519cf02a3453c452710c5 files/digest-mercury-0.12.2-r3 539
 RMD160 6be0bed956edd23408af2bcf449cd393419f64c0 files/digest-mercury-0.12.2-r3 539
 SHA256 76206eb085f179635a04f8ad1b2b53b1e4a2b4e1dccab1d25bac557e609f7df2 files/digest-mercury-0.12.2-r3 539
+MD5 0d30492cc04519cf02a3453c452710c5 files/digest-mercury-0.12.2-r4 539
+RMD160 6be0bed956edd23408af2bcf449cd393419f64c0 files/digest-mercury-0.12.2-r4 539
+SHA256 76206eb085f179635a04f8ad1b2b53b1e4a2b4e1dccab1d25bac557e609f7df2 files/digest-mercury-0.12.2-r4 539
 MD5 abd1c2293e5003b768dcb1eb1887b169 files/digest-mercury-0.13.0 539
 RMD160 236f26377c7b9be80a71be194ffc81a5e17e951c files/digest-mercury-0.13.0 539
 SHA256 d1aea703e42770341422638e334bea55c6ec6e502d4bd15ef3667d675a903a06 files/digest-mercury-0.13.0 539
diff --git a/dev-lang/mercury/files/digest-mercury-0.12.2-r4 b/dev-lang/mercury/files/digest-mercury-0.12.2-r4
new file mode 100644
index 000000000000..44b741b8da2b
--- /dev/null
+++ b/dev-lang/mercury/files/digest-mercury-0.12.2-r4
@@ -0,0 +1,6 @@
+MD5 49796cb9f475a0959d13ec7694777a94 mercury-compiler-0.12.2.tar.gz 15074997
+RMD160 227a3e1796d96ad77324d9f1d39efd6be7fce80e mercury-compiler-0.12.2.tar.gz 15074997
+SHA256 7fa1df8030cdc3d4dc848d102ba64bf23c12004461c985290622b81753b89572 mercury-compiler-0.12.2.tar.gz 15074997
+MD5 46099512bf8b9f1a336759845f2737f7 mercury-tests-0.12.2.tar.gz 897454
+RMD160 e7cf515b0d56aff5432c5ec3e535faa907ce2955 mercury-tests-0.12.2.tar.gz 897454
+SHA256 6d3fd92d11ce2a9ce99cfa35990027557d1c70f00a3417639523b6e27f746280 mercury-tests-0.12.2.tar.gz 897454
diff --git a/dev-lang/mercury/files/mercury-0.12.2-profdeep-builtin_throw.patch b/dev-lang/mercury/files/mercury-0.12.2-profdeep-builtin_throw.patch
new file mode 100644
index 000000000000..adb5d69e45c7
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.12.2-profdeep-builtin_throw.patch
@@ -0,0 +1,11 @@
+--- mercury-compiler-0.12.2.orig/library/exception.m	2005-01-25 12:16:37.000000000 +1300
++++ mercury-compiler-0.12.2/library/exception.m	2006-12-30 11:59:15.000000000 +1300
+@@ -1939,7 +1939,7 @@
+ 
+ MR_proc_static_user_no_site(exception, builtin_throw, 1, 0,
+ 	""exception.m"", MR_DUMMY_LINE, MR_TRUE);
+-MR_STATIC_USER_PROC_STATIC_PROC_LAYOUT(
++MR_EXTERN_USER_PROC_STATIC_PROC_LAYOUT(
+         MR_DETISM_DET, 1, MR_LONG_LVAL_STACKVAR(1),
+         MR_PREDICATE, exception, builtin_throw, 1, 0);
+ MR_MAKE_USER_INTERNAL_LAYOUT(exception, builtin_throw, 1, 0, 1);
diff --git a/dev-lang/mercury/mercury-0.12.2-r4.ebuild b/dev-lang/mercury/mercury-0.12.2-r4.ebuild
new file mode 100644
index 000000000000..15be89e4effd
--- /dev/null
+++ b/dev-lang/mercury/mercury-0.12.2-r4.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.12.2-r4.ebuild,v 1.1 2006/12/30 01:32:43 keri Exp $
+
+inherit eutils
+
+MY_P=${PN}-compiler-${PV}
+
+DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
+HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
+SRC_URI="ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/old-releases/0.12.2/mercury-compiler-0.12.2.tar.gz
+	ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/old-releases/0.12.2/mercury-tests-0.12.2.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+IUSE="debug minimal readline threads"
+
+DEPEND="readline? ( sys-libs/readline )"
+
+S="${WORKDIR}"/${MY_P}
+TESTDIR="${WORKDIR}"/${PN}-tests-${PV}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-portage-r3.patch
+	epatch "${FILESDIR}"/${P}-CFLAGS.patch
+	epatch "${FILESDIR}"/${P}-MAKEOPTS.patch
+	epatch "${FILESDIR}"/${P}-bootstrap.patch
+	epatch "${FILESDIR}"/${P}-LIBDIR.patch
+	epatch "${FILESDIR}"/${P}-libgrades.patch
+	epatch "${FILESDIR}"/${P}-parallel-install_grades.patch
+	epatch "${FILESDIR}"/${P}-deep_profiler.patch
+	epatch "${FILESDIR}"/${P}-docs.patch
+
+	cd "${TESTDIR}"
+	epatch "${FILESDIR}"/${P}-tests.patch
+	sed -i -e "s:MDB_DOC:${S}/doc/mdb_doc:" mdbrc
+}
+
+src_compile() {
+	local myconf
+	myconf="--disable-gcc-back-end \
+		--enable-aditi-back-end \
+		--enable-deep-profiler \
+		--disable-dotnet-grades \
+		--disable-java-grades \
+		$(use_enable debug debug-grades) \
+		$(use_enable threads par-grades) \
+		$(use_enable !minimal most-grades) \
+		$(use_with readline) \
+		PACKAGE_VERSION=${PV}"
+
+	einfo "Performing stage 1 bootstrap"
+	econf \
+		${myconf} \
+		BOOTSTRAP_STAGE="1" \
+		|| die "econf stage 1 failed"
+	emake \
+		EXTRA_MLFLAGS=--no-strip \
+		|| die "emake stage 1 failed"
+
+	einfo "Performing stage 2 bootstrap"
+	cp "${S}"/compiler/mercury_compile "${S}"/mercury_compile
+	epatch "${FILESDIR}"/${P}-pic_o-dependencies.patch
+	epatch "${FILESDIR}"/${P}-profdeep-builtin_throw.patch
+	econf \
+		${myconf} \
+		BOOTSTRAP_STAGE="2" \
+		|| die "econf stage 2 failed"
+	emake \
+		MERCURY_COMPILER="${S}"/mercury_compile \
+		depend || die "emake stage 2 depend failed"
+	emake \
+		MERCURY_COMPILER="${S}"/mercury_compile \
+		EXTRA_MLFLAGS=--no-strip \
+		|| die "emake stage 2 failed"
+
+	einfo "Compiling libgrades"
+	emake \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		libgrades || die "emake libgrades failed"
+}
+
+src_test() {
+	cd "${S}"
+	TEST_GRADE=`scripts/ml --print-grade`
+	if [ -d "${S}"/libgrades/${TEST_GRADE} ] ; then
+		TWS="${S}"/libgrades/${TEST_GRADE}
+		cp browser/mer_browser.init "${TWS}"/browser/
+		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
+		cp runtime/mer_rt.init "${TWS}"/runtime/
+	else
+		TWS="${S}"
+	fi
+
+	cd "${TESTDIR}"
+	PATH="${TWS}"/scripts:"${TWS}"/util:"${PATH}" \
+	WORKSPACE="${TWS}" \
+	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
+	MMAKE_DIR="${TWS}"/scripts \
+	MERCURY_DEBUGGER_INIT="${TESTDIR}"/mdbrc \
+	GRADE=${TEST_GRADE} \
+		mmake || die "mmake test failed"
+}
+
+src_install() {
+	make \
+		INSTALL_PREFIX="${D}"/usr \
+		INSTALL_MAN_DIR="${D}"/usr/share/man \
+		INSTALL_INFO_DIR="${D}"/usr/share/info \
+		INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
+		install || die "make install failed"
+
+	dodoc \
+		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
+		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
+		RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS
+}