From: Keri Harris <keri@gentoo.org>
Date: Sat, 17 Jun 2006 06:00:38 +0000 (+0000)
Subject: Enable hlc.par.gc libgrade on a minimal install if threading is enabled.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=73302be798cdad8f82a501f4e6dec3480c23d52b;p=gentoo.git

Enable hlc.par.gc libgrade on a minimal install if threading is enabled.
Package-Manager: portage-2.1
---

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 58d6d788d8ce..4cd7ab01ea45 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,10 @@
 # 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.29 2006/06/16 23:40:11 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.30 2006/06/17 06:00:38 keri Exp $
+
+  17 Jun 2006; Keri Harris <keri@gentoo.org>
+  +files/mercury-0.12.2-portage-r2.patch, mercury-0.12.2-r2.ebuild:
+  Enable hlc.par.gc libgrade on a minimal install if threading is enabled.
 
 *mercury-0.12.2-r2 (16 Jun 2006)
 
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index b04ee50c70e2..984b2458b636 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -14,6 +14,10 @@ AUX mercury-0.12.2-portage-r1.patch 4311 RMD160 e7b08a1914620410ebe216fd7677cd0e
 MD5 4d8eab7ca5541308733940a58a5d6ecf files/mercury-0.12.2-portage-r1.patch 4311
 RMD160 e7b08a1914620410ebe216fd7677cd0e3a36a462 files/mercury-0.12.2-portage-r1.patch 4311
 SHA256 0c3e24245829c21b1661c927cb155dba262f8d671ade173de796968c249e1e80 files/mercury-0.12.2-portage-r1.patch 4311
+AUX mercury-0.12.2-portage-r2.patch 4484 RMD160 69f7cfb287f0472ca7dc0371536a8fb80046b169 SHA1 86c1e6ce5e0b47c45ed261cffb26b91bc5687287 SHA256 3ce9161dfda11c1761c6e1bbc8b3f7e59f349742123ad69d2c63908a39e05384
+MD5 c09826ec6e2ea5094aa837825fa4706b files/mercury-0.12.2-portage-r2.patch 4484
+RMD160 69f7cfb287f0472ca7dc0371536a8fb80046b169 files/mercury-0.12.2-portage-r2.patch 4484
+SHA256 3ce9161dfda11c1761c6e1bbc8b3f7e59f349742123ad69d2c63908a39e05384 files/mercury-0.12.2-portage-r2.patch 4484
 AUX mercury-0.12.2-portage.patch 2052 RMD160 3fdcd9a309c27da3cf539829413ca8b15d5b50ab SHA1 3b9cc1c7ff9b0885feeeab35857ae862a7366169 SHA256 80189cf0515f212f2756f5c944b9eab5db3acdece1404ab11a4e5eedcd1b42e0
 MD5 bfc5cb304791178b3283d7cd48e750a7 files/mercury-0.12.2-portage.patch 2052
 RMD160 3fdcd9a309c27da3cf539829413ca8b15d5b50ab files/mercury-0.12.2-portage.patch 2052
@@ -45,10 +49,10 @@ EBUILD mercury-0.12.2-r1.ebuild 2004 RMD160 df7e09f85f3748560f9282b667c76b87b059
 MD5 8ac12895463559881728628ff9ce81cf mercury-0.12.2-r1.ebuild 2004
 RMD160 df7e09f85f3748560f9282b667c76b87b05948d1 mercury-0.12.2-r1.ebuild 2004
 SHA256 9aae052739461b696b10863110da7eab47406c6a629ce36d8792f258af0d2eeb mercury-0.12.2-r1.ebuild 2004
-EBUILD mercury-0.12.2-r2.ebuild 2049 RMD160 ac46ab78426366847d261e15186f948a5e2e73eb SHA1 34eff4da8869f548afb8fff2f04d8e9738a3b897 SHA256 c720c26188169afd6fe913340805a210792d5d435cd84bea3501b1f2b7ff5b33
-MD5 9a7a9f1f139e7d7c931ef3dbc54dffa4 mercury-0.12.2-r2.ebuild 2049
-RMD160 ac46ab78426366847d261e15186f948a5e2e73eb mercury-0.12.2-r2.ebuild 2049
-SHA256 c720c26188169afd6fe913340805a210792d5d435cd84bea3501b1f2b7ff5b33 mercury-0.12.2-r2.ebuild 2049
+EBUILD mercury-0.12.2-r2.ebuild 2049 RMD160 c0a8df3f11609daf1ccd6eec823be45ab57ec24f SHA1 2d7d1947097f21b5c8cea192ca94c04a5ee1703f SHA256 e223fedf0c90ade15625e3317fe8d1ea2a85bbd0069c6934d4afba3423ba56a0
+MD5 ff2bc9b91a0ab86b918fad587ada52f8 mercury-0.12.2-r2.ebuild 2049
+RMD160 c0a8df3f11609daf1ccd6eec823be45ab57ec24f mercury-0.12.2-r2.ebuild 2049
+SHA256 e223fedf0c90ade15625e3317fe8d1ea2a85bbd0069c6934d4afba3423ba56a0 mercury-0.12.2-r2.ebuild 2049
 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
@@ -57,10 +61,10 @@ EBUILD mercury-0.13.0_beta20060609.ebuild 1845 RMD160 354f5bb90e5dda319de58063c5
 MD5 5c1e60c4336b3b9feae61b32cfe6c65d mercury-0.13.0_beta20060609.ebuild 1845
 RMD160 354f5bb90e5dda319de58063c5a3c5bec4b71d61 mercury-0.13.0_beta20060609.ebuild 1845
 SHA256 58d18b4dbc89ab02c776b9f81b164e0d77c30c0fb695e8cfec0fd7c470a6238f mercury-0.13.0_beta20060609.ebuild 1845
-MISC ChangeLog 5084 RMD160 56214b885c2c0499c783f459065c56bb1210c90f SHA1 408bfa8d394aee5b4563cd26f70e86e6c449155f SHA256 2d9da8e90f5767c7e8330699438b279c7407f58b5e15581c10892667cc41baa8
-MD5 580706f2bbbb890555ffe35a8cd5291f ChangeLog 5084
-RMD160 56214b885c2c0499c783f459065c56bb1210c90f ChangeLog 5084
-SHA256 2d9da8e90f5767c7e8330699438b279c7407f58b5e15581c10892667cc41baa8 ChangeLog 5084
+MISC ChangeLog 5273 RMD160 5aa5c26e327f7b05e596cc7781b8a515235e583e SHA1 8d0aa3f3425117826a16a36cb568d56f7d3f53b5 SHA256 e848cb64d9375792a295ad23a7b02db66cdfd9f325e44501cff7ef4c6bc8cb19
+MD5 9308558a0b22005c0ed354eef89deec7 ChangeLog 5273
+RMD160 5aa5c26e327f7b05e596cc7781b8a515235e583e ChangeLog 5273
+SHA256 e848cb64d9375792a295ad23a7b02db66cdfd9f325e44501cff7ef4c6bc8cb19 ChangeLog 5273
 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-portage-r2.patch b/dev-lang/mercury/files/mercury-0.12.2-portage-r2.patch
new file mode 100644
index 000000000000..09ea4e596ac4
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.12.2-portage-r2.patch
@@ -0,0 +1,119 @@
+--- mercury-compiler-0.12.2.orig/Makefile	2004-11-01 17:46:18.000000000 +1300
++++ mercury-compiler-0.12.2/Makefile	2006-03-18 12:54:23.000000000 +1300
+@@ -26,7 +26,7 @@
+ 
+ .PHONY: all
+ all:
+-	$(MMAKE) MMAKEFLAGS=$(PARALLEL) all 2>&1 | tee make_all.log
++	$(MMAKE) MMAKEFLAGS=$(PARALLEL) all 2>&1 || exit 1
+ 
+ .PHONY: libmmc
+ libmmc:
+@@ -34,7 +34,7 @@
+ 
+ .PHONY: install
+ install:
+-	$(MMAKE) MMAKEFLAGS=$(PARALLEL) install 2>&1 | tee make_install.log
++	$(MMAKE) MMAKEFLAGS=$(PARALLEL) install 2>&1 || exit 1
+ 
+ # `mmake clean' has a different meaning to the usual GNU standard `make clean':
+ # it removes the .c files, which makes bootstrapping impossible unless you
+--- mercury-compiler-0.12.2.orig/Mmakefile	2005-01-28 20:11:29.000000000 +1300
++++ mercury-compiler-0.12.2/Mmakefile	2006-06-14 21:14:22.000000000 +1200
+@@ -429,28 +429,13 @@
+ 	@echo
+ 	@echo "-- Installation complete."
+ 	@echo
+-	@echo "-- Don't forget to add $(INSTALL_BINDIR) to your PATH,"
+-	@echo "-- $(INSTALL_MAN_DIR) to your MANPATH,"
+-	@echo "-- and $(INSTALL_INFO_DIR) to your INFOPATH,"
+-	@if test $(ENABLE_DEEP_PROFILER) != yes || \
+-		cmp -s deep_profiler/mdprof_cgi \
+-			$(INSTALL_CGI_DIR)/mdprof_cgi; \
+-	then true ; else \
+-		echo "-- to copy deep_profiler/mdprof_cgi" \
+-			"to $(INSTALL_CGI_DIR),"; \
+-	fi
+-	@echo "-- and to add the following lines to the \`.emacs' file"
+-	@echo "-- in your home directory:"
+-	@echo "	(setq load-path (cons (expand-file-name "
+-	@echo "		\"$(INSTALL_ELISP_DIR)\") load-path))"
+-	@echo "	(autoload 'mdb \"gud\" \"Invoke the Mercury debugger\" t)"
+ 
+ .PHONY: install_main
+ install_main: all \
+ 		install_scripts install_util install_runtime install_boehm_gc \
+ 		install_library install_mdbcomp install_browser install_trace \
+ 		install_compiler install_profiler install_deep_profiler \
+-		install_doc install_config
++		install_doc
+ 
+ .PHONY: install_scripts
+ install_scripts: scripts
+--- mercury-compiler-0.12.2.orig/configure	2006-01-25 17:24:01.000000000 +1300
++++ mercury-compiler-0.12.2/configure	2006-06-08 19:31:53.000000000 +1200
+@@ -8861,7 +8861,7 @@
+ # Check whether --enable-debug-grades or --disable-debug-grades was given.
+ if test "${enable_debug_grades+set}" = set; then
+   enableval="$enable_debug_grades"
+-  enable_debug_grades="enableval"
++  enable_debug_grades="$enableval"
+ else
+   enable_debug_grades=yes
+ fi;
+@@ -8948,7 +8948,6 @@
+ 	enable_trail_grades=no
+ 	enable_mm_grades=no
+ 	enable_hlc_prof_grades=no
+-	enable_par_grades=no
+ 	enable_dotnet_grades=no
+ 	enable_java_grade=no
+ fi
+--- mercury-compiler-0.12.2.orig/runtime/Mmakefile	2005-12-05 16:34:46.000000000 +1300
++++ mercury-compiler-0.12.2/runtime/Mmakefile	2006-06-14 20:52:31.000000000 +1200
+@@ -390,8 +390,6 @@
+ 	-[ -d $(INSTALL_MODULE_DIR) ] || mkdir -p $(INSTALL_MODULE_DIR)
+ 	-[ -d $(INSTALL_MERC_LIB_DIR) ] || mkdir -p $(INSTALL_MERC_LIB_DIR)
+ 	-[ -d $(INSTALL_CONF_DIR) ] || mkdir -p $(INSTALL_CONF_DIR)
+-	-[ -d $(INSTALL_RECONF_DIR)/runtime ] || \
+-		mkdir -p $(INSTALL_RECONF_DIR)/runtime
+ 
+ ifeq ($(findstring java,$(GRADE)),java)        
+ 
+@@ -437,7 +435,6 @@
+ 	rm -f $(INSTALL_INC_DIR)/mercury_conf.h
+ 	cp `vpath_find mercury_conf.h` $(INSTALL_CONF_DIR)
+ 	-chmod u+w $(INSTALL_CONF_DIR)/mercury_conf.h
+-	cp `vpath_find mercury_conf.h.in` $(INSTALL_RECONF_DIR)/runtime
+ 	cp `vpath_find $(MACHHDRS)` $(INSTALL_INC_DIR)/machdeps
+ 
+ .PHONY: install_init
+--- mercury-compiler-0.12.2.orig/scripts/Mmakefile	2005-01-28 20:11:59.000000000 +1300
++++ mercury-compiler-0.12.2/scripts/Mmakefile	2006-06-14 20:51:21.000000000 +1200
+@@ -16,8 +16,7 @@
+ 
+ SCRIPTS = mmake mmc mdb c2init mgnuc ml mprof mprof_merge_runs \
+ 	  mtags vpath_find mercury_update_interface \
+-	  mkfifo_using_mknod mercury_cleanup_install canonical_grade \
+-	  mercury_config mercury.bat prepare_tmp_dir_fixed_part
++	  mercury_cleanup_install canonical_grade
+ DEBUGGER_SCRIPTS = mdbrc xul_tree.xsl
+ EMACS_SCRIPTS = gud.el
+ 
+@@ -58,8 +57,6 @@
+ 	[ -d $(INSTALL_LIBDIR)/mdb ] || mkdir -p $(INSTALL_LIBDIR)/mdb
+ 	[ -d $(INSTALL_CONF_DIR) ] || mkdir -p $(INSTALL_CONF_DIR)
+ 	[ -d $(INSTALL_ELISP_DIR) ] || mkdir -p $(INSTALL_ELISP_DIR)
+-	[ -d $(INSTALL_RECONF_DIR)/scripts ] || \
+-		mkdir -p $(INSTALL_RECONF_DIR)/scripts
+ 
+ .PHONY: install_mmake
+ install_mmake: Mmake.vars Mmake.rules install_dirs
+@@ -77,7 +74,6 @@
+ 	-for file in $(SCRIPTS); do \
+ 		chmod u+w $(INSTALL_BINDIR)/$$file ;\
+ 	done
+-	cp *.in *.sh-subr $(SCRIPTS) $(INSTALL_RECONF_DIR)/scripts
+ 	-rm -f $(INSTALL_BINDIR)/mmake.old
+ 
+ .PHONY: install_config
diff --git a/dev-lang/mercury/mercury-0.12.2-r2.ebuild b/dev-lang/mercury/mercury-0.12.2-r2.ebuild
index 1111d595b9d4..cec395fa2b04 100644
--- a/dev-lang/mercury/mercury-0.12.2-r2.ebuild
+++ b/dev-lang/mercury/mercury-0.12.2-r2.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-r2.ebuild,v 1.1 2006/06/16 23:40:11 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.12.2-r2.ebuild,v 1.2 2006/06/17 06:00:38 keri Exp $
 
 inherit eutils
 
@@ -26,7 +26,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-portage-r1.patch
+	epatch "${FILESDIR}"/${P}-portage-r2.patch
 	epatch "${FILESDIR}"/${P}-CFLAGS.patch
 	epatch "${FILESDIR}"/${P}-LIBDIR.patch
 	epatch "${FILESDIR}"/${P}-docs.patch