Add support for Mercury deep profiler.

Package-Manager: portage-2.1.1

6 files changed, 197 insertions, 17 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 20c37451bdf4..e153f9c4826b 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,12 @@
 # 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.44 2006/09/16 21:39:03 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.45 2006/09/17 10:26:16 keri Exp $
+
+  17 Sep 2006; keri <keri@gentoo.org>
+  +files/mercury-0.12.2-deep_profiler.patch,
+  +files/mercury-0.13.0-deep_profiler.patch, mercury-0.12.2-r3.ebuild,
+  mercury-0.13.0.ebuild:
+  Add support for Mercury deep profiler.
 
   16 Sep 2006; keri <keri@gentoo.org>
   -files/mercury-0.13.0_beta-CFLAGS.patch,
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index c29558469b9e..305b734afd4e 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -14,6 +14,10 @@ AUX mercury-0.12.2-bootstrap.patch 2276 RMD160 60275fe011c88e4dd98d91094b3f7f140
 MD5 d6fa0d146d1fda99b9d5e35590c6f92b files/mercury-0.12.2-bootstrap.patch 2276
 RMD160 60275fe011c88e4dd98d91094b3f7f1407a34a65 files/mercury-0.12.2-bootstrap.patch 2276
 SHA256 2caccbf233da0eaec5eaf0c7a797f3d8b04169b956bfc40dc4248b3142bd2f67 files/mercury-0.12.2-bootstrap.patch 2276
+AUX mercury-0.12.2-deep_profiler.patch 2807 RMD160 533f90a2b4366279d030be3b9983cec05f8c743c SHA1 c09682feeb9d9c426d69635bc71140552f54fed8 SHA256 479546aaaf966c4665e444af187f099b51fb3c78479753297d78336701ef301f
+MD5 d60a4fa180d8a28cc2ab280c0cb33614 files/mercury-0.12.2-deep_profiler.patch 2807
+RMD160 533f90a2b4366279d030be3b9983cec05f8c743c files/mercury-0.12.2-deep_profiler.patch 2807
+SHA256 479546aaaf966c4665e444af187f099b51fb3c78479753297d78336701ef301f files/mercury-0.12.2-deep_profiler.patch 2807
 AUX mercury-0.12.2-docs.patch 796 RMD160 27543c5201dfcc3112878026c06f193e126288be SHA1 f7c2e543781f9f8b69777e7ef985279a6e9b284d SHA256 78be9f8ef2960ce9ea99b33734d9143a998d87056efa84bafb618cab74fcd514
 MD5 5e8e5942a015e9832289c90913fa2bca files/mercury-0.12.2-docs.patch 796
 RMD160 27543c5201dfcc3112878026c06f193e126288be files/mercury-0.12.2-docs.patch 796
@@ -58,6 +62,10 @@ AUX mercury-0.13.0-bootstrap.patch 2277 RMD160 2983cbd69ef84a8a6a12e88755971b8c5
 MD5 304a52a90c4dada7ab8956edfeca06db files/mercury-0.13.0-bootstrap.patch 2277
 RMD160 2983cbd69ef84a8a6a12e88755971b8c5616fe09 files/mercury-0.13.0-bootstrap.patch 2277
 SHA256 464ec654c11f95f80bd5afda0a3272240ff65b75aaebc220e108a701c6aba5e4 files/mercury-0.13.0-bootstrap.patch 2277
+AUX mercury-0.13.0-deep_profiler.patch 2807 RMD160 6d801fca00afdd1d2f13d83eaf26e028cc5505e8 SHA1 34bd7f90ccd05fd8bdb08f830c4456b8bfa4f571 SHA256 fc97b4151e3f3539955d78ff0dbb2d35c4f9cfd5e63aa64abd868fcd42d398f9
+MD5 9a6d2467a9a15bb0f851d2e44bd414d0 files/mercury-0.13.0-deep_profiler.patch 2807
+RMD160 6d801fca00afdd1d2f13d83eaf26e028cc5505e8 files/mercury-0.13.0-deep_profiler.patch 2807
+SHA256 fc97b4151e3f3539955d78ff0dbb2d35c4f9cfd5e63aa64abd868fcd42d398f9 files/mercury-0.13.0-deep_profiler.patch 2807
 AUX mercury-0.13.0-docs.patch 796 RMD160 f65bd4098e1a3c501f6adaf0da93377f6a8361f4 SHA1 ec8d4e4a0f014d7371859380fa560d330ad82069 SHA256 5ec2c671e14a07f087ae2c997b2ca5a7c2b176ee46685d86f8e995535f76625c
 MD5 07927ea891d5688ff041bc2c2bc82d2e files/mercury-0.13.0-docs.patch 796
 RMD160 f65bd4098e1a3c501f6adaf0da93377f6a8361f4 files/mercury-0.13.0-docs.patch 796
@@ -86,22 +94,22 @@ EBUILD mercury-0.12.2-r2.ebuild 2049 RMD160 286e8b51c81abc84709a5bb3c4719d6dde08
 MD5 f4478bfcf7e5b674cd7e94c73ec9fb74 mercury-0.12.2-r2.ebuild 2049
 RMD160 286e8b51c81abc84709a5bb3c4719d6dde080c87 mercury-0.12.2-r2.ebuild 2049
 SHA256 19b2346e8cb3d86ebcb600ebd180d4fa2ebd9b79e285add3b34dd32363d75d61 mercury-0.12.2-r2.ebuild 2049
-EBUILD mercury-0.12.2-r3.ebuild 2954 RMD160 421e4b7cbddee96a36cf3f03766601478b9034df SHA1 8a74941b0d6ac68f09a71b53da5e207a141a3b52 SHA256 f8d01b9f6092e4f867974eeca8acc98602fca79c50e4e6ac48c806b5fc01636e
-MD5 69d18759e6b7f5e46a3ad35430d2f65b mercury-0.12.2-r3.ebuild 2954
-RMD160 421e4b7cbddee96a36cf3f03766601478b9034df mercury-0.12.2-r3.ebuild 2954
-SHA256 f8d01b9f6092e4f867974eeca8acc98602fca79c50e4e6ac48c806b5fc01636e mercury-0.12.2-r3.ebuild 2954
+EBUILD mercury-0.12.2-r3.ebuild 3208 RMD160 cc692cf368c8ab8221a7ec4af704f4d2c61be637 SHA1 54f0eea9e154c60eabc08d10b9dcd39c8ff69811 SHA256 c3c923d52b043fa20757983851daf6dc7d7a02653490b6033151165a94decb85
+MD5 e4973b023312df4f64697420cc45da72 mercury-0.12.2-r3.ebuild 3208
+RMD160 cc692cf368c8ab8221a7ec4af704f4d2c61be637 mercury-0.12.2-r3.ebuild 3208
+SHA256 c3c923d52b043fa20757983851daf6dc7d7a02653490b6033151165a94decb85 mercury-0.12.2-r3.ebuild 3208
 EBUILD mercury-0.12.2.ebuild 1423 RMD160 9e5613b7a510ad5ba00c7ff079dffc3b788fb755 SHA1 8e8a9063248f02f94c4417a6c3f57626c04bd30b SHA256 89e50f4a3ca1267ba3b9715b42015c3be397a85068d7588c121473d3de2b78c8
 MD5 6f79d42347ca00bfe02253c965d88574 mercury-0.12.2.ebuild 1423
 RMD160 9e5613b7a510ad5ba00c7ff079dffc3b788fb755 mercury-0.12.2.ebuild 1423
 SHA256 89e50f4a3ca1267ba3b9715b42015c3be397a85068d7588c121473d3de2b78c8 mercury-0.12.2.ebuild 1423
-EBUILD mercury-0.13.0.ebuild 2948 RMD160 a1e8284e5631df2601845ee8966cb228fc1dc4fe SHA1 a7e6b64504c0078f508cce14f4ad03841d7615fc SHA256 dac4b76556b373e6d9beb3f8e20f678e972503f1f9bc606e136d523022da849f
-MD5 752631c0a497b9097f1090fbaf57c0c8 mercury-0.13.0.ebuild 2948
-RMD160 a1e8284e5631df2601845ee8966cb228fc1dc4fe mercury-0.13.0.ebuild 2948
-SHA256 dac4b76556b373e6d9beb3f8e20f678e972503f1f9bc606e136d523022da849f mercury-0.13.0.ebuild 2948
-MISC ChangeLog 8802 RMD160 c02b2cf35b05f476d0b58ba885b43ec5c4e5ef2b SHA1 69bebdea88f29fbf4b3e2133c49648431e2d3f48 SHA256 5a7873184685b5223103d4a009a8db87e5d000fd66613d2d8de3f31dcabe1ae5
-MD5 497cd62472582123e913a00532795d4b ChangeLog 8802
-RMD160 c02b2cf35b05f476d0b58ba885b43ec5c4e5ef2b ChangeLog 8802
-SHA256 5a7873184685b5223103d4a009a8db87e5d000fd66613d2d8de3f31dcabe1ae5 ChangeLog 8802
+EBUILD mercury-0.13.0.ebuild 3202 RMD160 7c92e72eeb7fe6b2a81ec6d8182ccabb823083bd SHA1 f9ba6f508f428781f96c6365ef854e8bb10a7340 SHA256 48eeeaf6005c0f1ea132b70e4d0c84ad5cc2e1cf14329ea54f489b109df7b929
+MD5 da6f8c788e1773b497557983ef71eb29 mercury-0.13.0.ebuild 3202
+RMD160 7c92e72eeb7fe6b2a81ec6d8182ccabb823083bd mercury-0.13.0.ebuild 3202
+SHA256 48eeeaf6005c0f1ea132b70e4d0c84ad5cc2e1cf14329ea54f489b109df7b929 mercury-0.13.0.ebuild 3202
+MISC ChangeLog 9023 RMD160 720e5ba8323625247f1bdd54704be44a5df1aaa1 SHA1 30f9b703037961e2e1f0d009ae7fe85a37a9f2b8 SHA256 daf61763fa8834eb97c9e5a4661c4537db6e79a9d2150833f7453838ccb88ed0
+MD5 bda94a5ce1d5734e27d4c9be03dfc410 ChangeLog 9023
+RMD160 720e5ba8323625247f1bdd54704be44a5df1aaa1 ChangeLog 9023
+SHA256 daf61763fa8834eb97c9e5a4661c4537db6e79a9d2150833f7453838ccb88ed0 ChangeLog 9023
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
 MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247
 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247
diff --git a/dev-lang/mercury/files/mercury-0.12.2-deep_profiler.patch b/dev-lang/mercury/files/mercury-0.12.2-deep_profiler.patch
new file mode 100644
index 000000000000..3d55902e08a1
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.12.2-deep_profiler.patch
@@ -0,0 +1,75 @@
+--- mercury-compiler-0.12.2.orig/configure	2006-01-25 17:24:01.000000000 +1300
++++ mercury-compiler-0.12.2/configure	2006-09-17 21:17:26.000000000 +1200
+@@ -8482,14 +8482,14 @@
+ esac
+ 
+ case $enable_deep_profiler in
+-	default)
+-		if test -d $mercury_cv_default_cgi_dir; then
+-			mercury_cv_enable_deep_profiler=$mercury_cv_can_enable_deep_profiler
+-			mercury_cv_cgi_dir=$mercury_cv_default_cgi_dir
+-		else
+-			mercury_cv_enable_deep_profiler=no
+-		fi
+-		;;
++#	default)
++#		if test -d $mercury_cv_default_cgi_dir; then
++#			mercury_cv_enable_deep_profiler=$mercury_cv_can_enable_deep_profiler
++#			mercury_cv_cgi_dir=$mercury_cv_default_cgi_dir
++#		else
++#			mercury_cv_enable_deep_profiler=no
++#		fi
++#		;;
+ 	no)
+ 		mercury_cv_enable_deep_profiler=no
+ 		;;
+@@ -8514,17 +8514,17 @@
+ 		;;
+ esac
+ 
+-if test $mercury_cv_enable_deep_profiler = yes; then
+-	if test -d $mercury_cv_cgi_dir; then
+-		true
+-	else
+-		echo "$as_me:$LINENO: result: $enable_deep_profiler" >&5
+-echo "${ECHO_T}$enable_deep_profiler" >&6
+-		{ { echo "$as_me:$LINENO: error: CGI script directory $mercury_cv_cgi_dir does not exist" >&5
+-echo "$as_me: error: CGI script directory $mercury_cv_cgi_dir does not exist" >&2;}
+-   { (exit 1); exit 1; }; }
+-	fi
+-fi
++#if test $mercury_cv_enable_deep_profiler = yes; then
++#	if test -d $mercury_cv_cgi_dir; then
++#		true
++#	else
++#		echo "$as_me:$LINENO: result: $enable_deep_profiler" >&5
++#echo "${ECHO_T}$enable_deep_profiler" >&6
++#		{ { echo "$as_me:$LINENO: error: CGI script directory $mercury_cv_cgi_dir does not exist" >&5
++#echo "$as_me: error: CGI script directory $mercury_cv_cgi_dir does not exist" >&2;}
++#   { (exit 1); exit 1; }; }
++#	fi
++#fi
+ 
+ echo "$as_me:$LINENO: result: $mercury_cv_enable_deep_profiler" >&5
+ echo "${ECHO_T}$mercury_cv_enable_deep_profiler" >&6
+--- mercury-compiler-0.12.2.orig/deep_profiler/Mmakefile	2005-01-14 18:53:29.000000000 +1300
++++ mercury-compiler-0.12.2/deep_profiler/Mmakefile	2006-09-17 21:04:34.000000000 +1200
+@@ -140,12 +140,12 @@
+ 	# executed when we do the install. The mv is of course expected to
+ 	# fail during a first-time installation. The rm is before the move
+ 	# in case this is the third or later installation.
+-	-if test $(ENABLE_DEEP_PROFILER) = yes ; then \
+-		rm $(INSTALL_CGI_DIR)/mdprof_cgi.was ; \
+-		mv $(INSTALL_CGI_DIR)/mdprof_cgi \
+-			$(INSTALL_CGI_DIR)/mdprof_cgi.was ; \
+-		cp mdprof_cgi $(INSTALL_CGI_DIR) ; \
+-	fi
++	#-if test $(ENABLE_DEEP_PROFILER) = yes ; then \
++	#	rm $(INSTALL_CGI_DIR)/mdprof_cgi.was ; \
++	#	mv $(INSTALL_CGI_DIR)/mdprof_cgi \
++	#		$(INSTALL_CGI_DIR)/mdprof_cgi.was ; \
++	#	cp mdprof_cgi $(INSTALL_CGI_DIR) ; \
++	#fi
+ 	# We also install mdprof_cgi in $(INSTALL_MERC_BIN_DIR).
+ 	# This is done just so that it can easily get put in the
+ 	# binary distribution (even if the step above failed).
diff --git a/dev-lang/mercury/files/mercury-0.13.0-deep_profiler.patch b/dev-lang/mercury/files/mercury-0.13.0-deep_profiler.patch
new file mode 100644
index 000000000000..0daad9656956
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.13.0-deep_profiler.patch
@@ -0,0 +1,75 @@
+--- mercury-compiler-0.13.0.orig/configure	2006-09-14 16:06:21.000000000 +1200
++++ mercury-compiler-0.13.0/configure	2006-09-17 22:14:27.000000000 +1200
+@@ -8663,14 +8663,14 @@
+ esac
+ 
+ case $enable_deep_profiler in
+-	default)
+-		if test -d $mercury_cv_default_cgi_dir; then
+-			mercury_cv_enable_deep_profiler=$mercury_cv_can_enable_deep_profiler
+-			mercury_cv_cgi_dir=$mercury_cv_default_cgi_dir
+-		else
+-			mercury_cv_enable_deep_profiler=no
+-		fi
+-		;;
++#	default)
++#		if test -d $mercury_cv_default_cgi_dir; then
++#			mercury_cv_enable_deep_profiler=$mercury_cv_can_enable_deep_profiler
++#			mercury_cv_cgi_dir=$mercury_cv_default_cgi_dir
++#		else
++#			mercury_cv_enable_deep_profiler=no
++#		fi
++#		;;
+ 	no)
+ 		mercury_cv_enable_deep_profiler=no
+ 		;;
+@@ -8695,17 +8695,17 @@
+ 		;;
+ esac
+ 
+-if test $mercury_cv_enable_deep_profiler = yes; then
+-	if test -d $mercury_cv_cgi_dir; then
+-		true
+-	else
+-		echo "$as_me:$LINENO: result: $enable_deep_profiler" >&5
+-echo "${ECHO_T}$enable_deep_profiler" >&6
+-		{ { echo "$as_me:$LINENO: error: CGI script directory $mercury_cv_cgi_dir does not exist" >&5
+-echo "$as_me: error: CGI script directory $mercury_cv_cgi_dir does not exist" >&2;}
+-   { (exit 1); exit 1; }; }
+-	fi
+-fi
++#if test $mercury_cv_enable_deep_profiler = yes; then
++#	if test -d $mercury_cv_cgi_dir; then
++#		true
++#	else
++#		echo "$as_me:$LINENO: result: $enable_deep_profiler" >&5
++#echo "${ECHO_T}$enable_deep_profiler" >&6
++#		{ { echo "$as_me:$LINENO: error: CGI script directory $mercury_cv_cgi_dir does not exist" >&5
++#echo "$as_me: error: CGI script directory $mercury_cv_cgi_dir does not exist" >&2;}
++#   { (exit 1); exit 1; }; }
++#	fi
++#fi
+ 
+ echo "$as_me:$LINENO: result: $mercury_cv_enable_deep_profiler" >&5
+ echo "${ECHO_T}$mercury_cv_enable_deep_profiler" >&6
+--- mercury-compiler-0.13.0.orig/deep_profiler/Mmakefile	2005-12-16 18:49:39.000000000 +1300
++++ mercury-compiler-0.13.0/deep_profiler/Mmakefile	2006-09-17 22:14:27.000000000 +1200
+@@ -155,12 +155,12 @@
+ 	# executed when we do the install. The mv is of course expected to
+ 	# fail during a first-time installation. The rm is before the move
+ 	# in case this is the third or later installation.
+-	-if test $(ENABLE_DEEP_PROFILER) = yes ; then \
+-		rm $(INSTALL_CGI_DIR)/mdprof_cgi.was ; \
+-		mv $(INSTALL_CGI_DIR)/mdprof_cgi \
+-			$(INSTALL_CGI_DIR)/mdprof_cgi.was ; \
+-		cp mdprof_cgi $(INSTALL_CGI_DIR) ; \
+-	fi
++	#-if test $(ENABLE_DEEP_PROFILER) = yes ; then \
++	#	rm $(INSTALL_CGI_DIR)/mdprof_cgi.was ; \
++	#	mv $(INSTALL_CGI_DIR)/mdprof_cgi \
++	#		$(INSTALL_CGI_DIR)/mdprof_cgi.was ; \
++	#	cp mdprof_cgi $(INSTALL_CGI_DIR) ; \
++	#fi
+ 	# We also install mdprof_cgi in $(INSTALL_MERC_BIN_DIR).
+ 	# This is done just so that it can easily get put in the
+ 	# binary distribution (even if the step above failed).
diff --git a/dev-lang/mercury/mercury-0.12.2-r3.ebuild b/dev-lang/mercury/mercury-0.12.2-r3.ebuild
index 878230463eca..4a316687573e 100644
--- a/dev-lang/mercury/mercury-0.12.2-r3.ebuild
+++ b/dev-lang/mercury/mercury-0.12.2-r3.ebuild
@@ -1,6 +1,6 @@
 # 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-r3.ebuild,v 1.3 2006/09/11 09:51:58 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.12.2-r3.ebuild,v 1.4 2006/09/17 10:26:16 keri Exp $
 
 inherit eutils
 
@@ -32,6 +32,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-bootstrap.patch
 	epatch "${FILESDIR}"/${P}-LIBDIR.patch
 	epatch "${FILESDIR}"/${P}-libgrades.patch
+	epatch "${FILESDIR}"/${P}-deep_profiler.patch
 	epatch "${FILESDIR}"/${P}-docs.patch
 
 	cd "${TESTDIR}"
@@ -41,7 +42,11 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	myconf="--disable-dotnet-grades \
+	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) \
@@ -63,6 +68,9 @@ src_compile() {
 		|| die "econf stage 2 failed"
 	emake \
 		MERCURY_COMPILER="${S}"/mercury_compile \
+		depend || die "emake stage 2 depend failed"
+	emake \
+		MERCURY_COMPILER="${S}"/mercury_compile \
 		|| die "emake stage 2 failed"
 
 	einfo "Compiling libgrades"
diff --git a/dev-lang/mercury/mercury-0.13.0.ebuild b/dev-lang/mercury/mercury-0.13.0.ebuild
index 4d98afa4703b..14e16967e13b 100644
--- a/dev-lang/mercury/mercury-0.13.0.ebuild
+++ b/dev-lang/mercury/mercury-0.13.0.ebuild
@@ -1,6 +1,6 @@
 # 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.13.0.ebuild,v 1.1 2006/09/16 01:09:09 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.0.ebuild,v 1.2 2006/09/17 10:26:16 keri Exp $
 
 inherit eutils
 
@@ -32,6 +32,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-bootstrap.patch
 	epatch "${FILESDIR}"/${P}-LIBDIR.patch
 	epatch "${FILESDIR}"/${P}-libgrades.patch
+	epatch "${FILESDIR}"/${P}-deep_profiler.patch
 	epatch "${FILESDIR}"/${P}-docs.patch
 
 	cd "${TESTDIR}"
@@ -41,7 +42,11 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	myconf="--disable-dotnet-grades \
+	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) \
@@ -63,6 +68,9 @@ src_compile() {
 		|| die "econf stage 2 failed"
 	emake \
 		MERCURY_COMPILER="${S}"/mercury_compile \
+		depend || die "emake stage 2 depend failed"
+	emake \
+		MERCURY_COMPILER="${S}"/mercury_compile \
 		|| die "emake stage 2 failed"
 
 	einfo "Compiling libgrades"