Add support for Mercury deep profiler.

(Portage version: 2.1.1)

5 files changed, 177 insertions, 5 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/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"