Compile libgrades after default llds grade in case default llds grade != default grade (used in testsuite)

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 308 insertions, 6 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 537481a34920..129e5a44feae 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/mercury
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.108 2010/07/24 02:29:17 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.109 2010/07/25 08:45:23 keri Exp $
+
+  25 Jul 2010; <keri@gentoo.org> mercury-10.04.ebuild,
+  +files/mercury-10.04-libgrades.patch:
+  Compile libgrades after default llds grade in case default llds grade !=
+  default grade (used in testsuite)
 
   24 Jul 2010; <keri@gentoo.org> files/mercury-10.04-boehm_gc.patch:
   Update generic mach_dep for ASM_CLEAR_CODE targets
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index ef2a9ab7b713..1b5bc75e3e05 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -11,6 +11,7 @@ AUX mercury-0.13.1-tests-string_format.patch 15357 RMD160 1b3f5538f6c8aa9daa430d
 AUX mercury-0.13.1-tests-workspace.patch 899 RMD160 f866379e0e4f8e4debebb86bfed778e881c9e790 SHA1 6b6cc428a516c082bcd7ac8bdbe05de1b1e75831 SHA256 8ab0c250ccdfdb57ba377335fd61dc980ad87135e388c6ae4ebe0ff3c464e456
 AUX mercury-10.04-boehm_gc.patch 5908 RMD160 08ce24e7df84974b9c77ead866a3b10738b35132 SHA1 822914bf2116d2227097fa725705cd2ec5d4c55d SHA256 5cd45f249b6c0dd74b43f4c2e4237184da722e0a25941f3070804e56418a5467
 AUX mercury-10.04-docs.patch 1071 RMD160 7227e1c079b269f332081b956e53b85358d72a70 SHA1 f27b48ecb5ba991261f93c2c8d640b7fd213830b SHA256 a4514f76a7174d16f392e3f9aa55d19a468f114541cf93129908feeaec462c06
+AUX mercury-10.04-libgrades.patch 9440 RMD160 7f8d14f4a79145d7a2dcd0d5bee01f94671524c2 SHA1 99668480396eb81fa0aa1d9dccb8c63f8ff24ba2 SHA256 fd4a593268d7213bfb2bddc02ca6b5c9edd70a42aaa4a040ad8b570c851a6397
 AUX mercury-10.04-multilib.patch 5993 RMD160 70cf37287f8a352eb09f66c402ea0e6690dd26be SHA1 1f0b47f3bfab7ffe54c487bde1c84e0499bca2f0 SHA256 43497f32f110e064bedae7b2aeaef63fc6b394276d7aa7e46864c97781de4db3
 AUX mercury-10.04-no-reconf.patch 2337 RMD160 f39b7e0c777eba144d103078d3e81fb0a4ea21c7 SHA1 a4166eaf922e6423ff8761f486691f5b75fc14f9 SHA256 3b4dc9724fe9baed3222e43d86d3af73692d0f3f7285f6b6dbd4df0407690921
 AUX mercury-10.04-tests-mercury-float.patch 2056 RMD160 0eeda80258e9e675be1866d42428618efa1cc2f9 SHA1 d69de5c6e94601e49c4e4d459996e0fa5fda996e SHA256 79f6b92ea2d37d3c0b8147497a110266278a193fcee825270c2217c1d44aa4a1
@@ -32,7 +33,7 @@ DIST mercury-tests-0.13.1.tar.gz 986644 RMD160 779609ba5c985e562b0962434c9281c07
 DIST mercury-tests-10.04-beta.tar.gz 5876463 RMD160 b29179ae78b1dcb0619684228abac0d6cd4471a8 SHA1 3fed8b5fbe840e844df725f386a08836825d48da SHA256 4c1bf8eece8f95fdf13eeaef8dc5ea4fee30646d20fed684fe6eb710d5234833
 DIST mercury-tests-10.04.tar.gz 1329423 RMD160 c85e489eea4e36fef6d12fb9bf4e7cd01bb2e7fd SHA1 32ca9267d58d2cbb7d144c1501803f0a7b92f145 SHA256 d56a76b4a2c8c2cc878b7a7cd04fd34b4069cef1316155a942f4372425d45085
 EBUILD mercury-0.13.1-r2.ebuild 3350 RMD160 8a1635d8c301751b2da7260785baaa788b81b620 SHA1 2aae241faf85518b6bb6d162939b2f293eb67649 SHA256 af0a034331b9a7acb0d0a7dea42fc84aafcf9e66de2b6fceddc623f975689c44
-EBUILD mercury-10.04.ebuild 3536 RMD160 14a91fd0dc57aa09e6bf63914edf12a089b36665 SHA1 83a6de1b53a1f1f50cbe6c6c64c8edd739793c9a SHA256 1f2fabefef7ea9acf6976f92edd6b9bca432ed9b4b8ae4cb226518e5c168e3da
+EBUILD mercury-10.04.ebuild 4031 RMD160 d8dc15539f84d5a5f5d423dcd69e2557bf97c5d7 SHA1 3f7eea84ad04c35e605a5d44e485a58140a9eff9 SHA256 767fec41c694461401df859d45066df13bd113d903b4153036d5808e390d3a06
 EBUILD mercury-10.04_beta1.ebuild 3561 RMD160 b608b732acdfccb4a8ccdc4728bdd0b9f3f28283 SHA1 319302199665f6e4ffa9aaff95128fcd8a7d63a0 SHA256 ffbba59515166327f79a698086d516f14fcbcfc8c76f58dbf1116eaa8eb16626
-MISC ChangeLog 21804 RMD160 1c0a96f6ec12b164993f84c01f8c4f6ed4de00cc SHA1 d12647b29bc3c879352c12540245bc514d86e616 SHA256 c9c7c5d3c0d930e3648c1a5120a045c5eaccdf7e47298f2651a64d88f27663fc
+MISC ChangeLog 22011 RMD160 b2a006856b397efe899380643b232ba2a5aece1f SHA1 7be7aa7073eae33b81a4975e6e9fbe9c514f6c98 SHA256 77314da31ef680c41ebb3bfdba072177a460bc2d25eab93d14f9353324b66a6f
 MISC metadata.xml 318 RMD160 b9e62c5b9d04f43a6570cfcadd6a6c9a2b9e3f6f SHA1 67893d667419e727696eb2c386565794fd137418 SHA256 5e64767eb2ff6b10d88b169c87648d62b534356fb94c5407a253aeafc2d16935
diff --git a/dev-lang/mercury/files/mercury-10.04-libgrades.patch b/dev-lang/mercury/files/mercury-10.04-libgrades.patch
new file mode 100644
index 000000000000..ed63fbc6a65c
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-10.04-libgrades.patch
@@ -0,0 +1,281 @@
+diff -ur mercury-compiler-10.04.orig/Makefile mercury-compiler-10.04/Makefile
+--- mercury-compiler-10.04.orig/Makefile	2010-07-12 04:31:01.000000000 +1200
++++ mercury-compiler-10.04/Makefile	2010-07-25 20:05:55.000000000 +1200
+@@ -69,6 +69,6 @@
+ 	$(MMAKE) uninstall
+ 
+ .DEFAULT:
+-	$(MMAKE) $@
++	$(MMAKE) MMAKEFLAGS=$(PARALLEL) $@
+ 
+ #-----------------------------------------------------------------------------#
+diff -ur mercury-compiler-10.04.orig/Mmakefile mercury-compiler-10.04/Mmakefile
+--- mercury-compiler-10.04.orig/Mmakefile	2009-10-20 17:07:24.000000000 +1300
++++ mercury-compiler-10.04/Mmakefile	2010-07-25 20:05:55.000000000 +1200
+@@ -286,6 +286,54 @@
+ 		mdbcomp browser ssdb trace
+ 	+cd deep_profiler && $(SUBDIR_MMAKE)
+ 
++.PHONY: libgrades
++libgrades:
++	+for grade in x $(LIBGRADES); do                                      \
++	    if [ "$${grade}" = "x" -o "$${grade}" = "$(GRADE)" ]; then        \
++		continue;                                                     \
++	    fi;                                                               \
++	    case $${grade} in                                                 \
++		java*|erlang*) continue;                                      \
++	    esac;                                                             \
++	    gc_grade=`scripts/ml --grade $${grade} --print-gc-grade`;         \
++	    IWS=`/bin/pwd`/install_grade_dir.$${grade};                       \
++	    (                                                                 \
++		scripts/prepare_install_dir $${IWS} &&                        \
++		( cd $${IWS}/boehm_gc &&                                      \
++		  $(SUBDIR_MMAKE) MC=mmc GRADE=$${grade} WORKSPACE=$${IWS}    \
++			GC_GRADE=$${gc_grade} libgrade ) &&                   \
++		( cd $${IWS}/runtime &&                                       \
++		  $(SUBDIR_MMAKE) MC=mmc GRADE=$${grade} WORKSPACE=$${IWS}    \
++			libgrade ) &&                                         \
++		( cd $${IWS}/library &&                                       \
++		  $(SUBDIR_MMAKE) MC=mmc GRADE=$${grade} WORKSPACE=$${IWS}    \
++			depend &&                                             \
++		  $(SUBDIR_MMAKE) MC=mmc GRADE=$${grade} WORKSPACE=$${IWS}    \
++			libgrade ) &&                                         \
++		( cd $${IWS}/mdbcomp &&                                       \
++		  $(SUBDIR_MMAKE) MC=mmc GRADE=$${grade} WORKSPACE=$${IWS}    \
++			depend &&                                             \
++		  $(SUBDIR_MMAKE) MC=mmc GRADE=$${grade} WORKSPACE=$${IWS}    \
++			libgrade ) &&                                         \
++		( cd $${IWS}/browser &&                                       \
++		  $(SUBDIR_MMAKE) MC=mmc GRADE=$${grade} WORKSPACE=$${IWS}    \
++			depend &&                                             \
++		  $(SUBDIR_MMAKE) MC=mmc GRADE=$${grade} WORKSPACE=$${IWS}    \
++			libgrade ) &&                                         \
++		( cd $${IWS}/ssdb &&                                          \
++		  $(SUBDIR_MMAKE) MC=mmc GRADE=$${grade} WORKSPACE=$${IWS}    \
++			depend &&                                             \
++		  $(SUBDIR_MMAKE) MC=mmc GRADE=$${grade} WORKSPACE=$${IWS}    \
++			libgrade ) &&                                         \
++		( cd $${IWS}/trace &&                                         \
++		  $(SUBDIR_MMAKE) MC=mmc GRADE=$${grade} WORKSPACE=$${IWS}    \
++			libgrade ) &&                                         \
++		true                                                          \
++	    ) ||                                                              \
++	    { echo "To clean up from failed install, remove $${IWS}";         \
++	      exit 1; };                                                      \
++	done;
++
+ #-----------------------------------------------------------------------------#
+ 
+ .PHONY: tags
+diff -ur mercury-compiler-10.04.orig/boehm_gc/Mmakefile mercury-compiler-10.04/boehm_gc/Mmakefile
+--- mercury-compiler-10.04.orig/boehm_gc/Mmakefile	2010-02-27 02:16:44.000000000 +1300
++++ mercury-compiler-10.04/boehm_gc/Mmakefile	2010-07-25 20:05:55.000000000 +1200
+@@ -176,6 +176,9 @@
+ 
+ # No need to install the Boehm collector for grades which don't use it.
+ 
++.PHONY: libgrade
++libgrade:
++
+ .PHONY: install_headers
+ install_headers:
+ 
+@@ -187,6 +190,9 @@
+ 
+ else
+ 
++.PHONY: libgrade
++libgrade: lib$(GC_GRADE).$A lib$(GC_GRADE).$(EXT_FOR_SHARED_LIB)
++
+ .PHONY: install_headers
+ install_headers: install_dirs
+ 	cp $(HEADERS) $(INSTALL_INC_DIR)
+diff -ur mercury-compiler-10.04.orig/browser/Mmakefile mercury-compiler-10.04/browser/Mmakefile
+--- mercury-compiler-10.04.orig/browser/Mmakefile	2010-05-10 18:31:55.000000000 +1200
++++ mercury-compiler-10.04/browser/Mmakefile	2010-07-25 20:05:55.000000000 +1200
+@@ -256,16 +256,28 @@
+ 
+ # there is no browser in the .NET or Erlang backends
+ 
++.PHONY: libgrade
++libgrade:
++
+ .PHONY: install_library
+ install_library:
+ 
+ else ifneq (,$(findstring java,$(GRADE)))
+ 
++.PHONY: libgrade
++libgrade:
++
+ .PHONY: install_library
+ install_library: lib$(BROWSER_LIB_NAME).install
+ 
+ else 
+ 
++.PHONY: libgrade
++libgrade: \
++	lib$(BROWSER_LIB_NAME).$A \
++	lib$(BROWSER_LIB_NAME).$(EXT_FOR_SHARED_LIB) \
++	all-ints
++
+ .PHONY: install_library
+ install_library:				\
+ 	lib$(BROWSER_LIB_NAME).install_library	\
+diff -ur mercury-compiler-10.04.orig/library/Mmakefile mercury-compiler-10.04/library/Mmakefile
+--- mercury-compiler-10.04.orig/library/Mmakefile	2010-05-20 21:29:30.000000000 +1200
++++ mercury-compiler-10.04/library/Mmakefile	2010-07-25 20:05:55.000000000 +1200
+@@ -493,6 +493,9 @@
+ 
+ # XXX some modules in the browser directory need library.int3
+ 
++.PHONY: libgrade
++libgrade: mercury.dll
++
+ .PHONY: install_library
+ install_library: mercury.dll install_grade_dirs install_gac \
+ 		install_strong_name lib$(STD_LIB_NAME).install_grade_hdrs \
+@@ -531,6 +534,9 @@
+ 
+ else
+ 
++.PHONY: libgrade
++libgrade: lib$(STD_LIB_NAME)
++
+ # we depend on lib$(STD_LIB_NAME) because lib$(STD_LIB_NAME).install_library
+ # doesn't make library.int3, but some modules in the browser directory need it.
+ 
+@@ -541,6 +547,9 @@
+ 
+ else	#ifneq ($(MMAKE_USE_MMC_MAKE),yes)
+ 
++.PHONY: libgrade
++libgrade: lib$(STD_LIB_NAME) all-ints
++
+ .PHONY: install_mercury
+ install_mercury: install_library
+ 
+diff -ur mercury-compiler-10.04.orig/mdbcomp/Mmakefile mercury-compiler-10.04/mdbcomp/Mmakefile
+--- mercury-compiler-10.04.orig/mdbcomp/Mmakefile	2010-05-10 18:32:00.000000000 +1200
++++ mercury-compiler-10.04/mdbcomp/Mmakefile	2010-07-25 20:05:55.000000000 +1200
+@@ -215,16 +215,28 @@
+ 
+ # there is no debugger in the .NET or Erlang backends
+ 
++.PHONY: libgrade
++libgrade:
++
+ .PHONY: install_library
+ install_library:
+ 
+ else ifneq (,$(findstring java,$(GRADE)))
+ 
++.PHONY: libgrade
++libgrade:
++
+ .PHONY: install_library
+ install_library: lib$(MDBCOMP_LIB_NAME).install
+ 
+ else
+ 
++.PHONY: libgrade
++libgrade: \
++	lib$(MDBCOMP_LIB_NAME).$A \
++	lib$(MDBCOMP_LIB_NAME).$(EXT_FOR_SHARED_LIB) \
++	all-ints
++
+ .PHONY: install_library
+ install_library:				\
+ 	lib$(MDBCOMP_LIB_NAME).install_library	\
+diff -ur mercury-compiler-10.04.orig/runtime/Mmakefile mercury-compiler-10.04/runtime/Mmakefile
+--- mercury-compiler-10.04.orig/runtime/Mmakefile	2010-07-16 03:24:52.000000000 +1200
++++ mercury-compiler-10.04/runtime/Mmakefile	2010-07-25 20:05:55.000000000 +1200
+@@ -466,6 +466,9 @@
+ # mercury/library/Mmakefile.)
+ # (Runtime support for the Erlang backend is in the library directory.)
+ 
++.PHONY: libgrade
++libgrade:
++
+ .PHONY: install_headers
+ install_headers:
+ 
+@@ -478,6 +481,9 @@
+ else
+ ifeq ($(findstring il,$(GRADE)),il)
+ 
++.PHONY: libgrade
++libgrade: $(DOTNET_DLLS)
++
+ .PHONY: install_headers
+ install_headers:
+ 
+@@ -492,6 +498,9 @@
+ 
+ else
+ 
++.PHONY: libgrade
++libgrade: lib$(RT_LIB_NAME).$A lib$(RT_LIB_NAME).$(EXT_FOR_SHARED_LIB)
++
+ # mercury_conf.h needs to be in a separate directory so it can be
+ # overridden by a different configuration.
+ .PHONY: install_headers
+diff -ur mercury-compiler-10.04.orig/ssdb/Mmakefile mercury-compiler-10.04/ssdb/Mmakefile
+--- mercury-compiler-10.04.orig/ssdb/Mmakefile	2010-05-10 18:32:00.000000000 +1200
++++ mercury-compiler-10.04/ssdb/Mmakefile	2010-07-25 20:05:55.000000000 +1200
+@@ -250,16 +250,28 @@
+ 
+ # there is no ssdb in the .NET or Erlang backends
+ 
++.PHONY: libgrade
++libgrade:
++
+ .PHONY: install_library
+ install_library:
+ 
+ else ifneq (,$(findstring java,$(GRADE)))
+ 
++.PHONY: libgrade
++libgrade:
++
+ .PHONY: install_library
+ install_library: lib$(SSDB_LIB_NAME).install
+ 
+ else 
+ 
++.PHONY: libgrade
++libgrade: \
++	lib$(SSDB_LIB_NAME).$A \
++	lib$(SSDB_LIB_NAME).$(EXT_FOR_SHARED_LIB) \
++	all-ints
++
+ .PHONY: install_library
+ install_library:				\
+ 	lib$(SSDB_LIB_NAME).install_library	\
+diff -ur mercury-compiler-10.04.orig/trace/Mmakefile mercury-compiler-10.04/trace/Mmakefile
+--- mercury-compiler-10.04.orig/trace/Mmakefile	2008-07-30 05:58:58.000000000 +1200
++++ mercury-compiler-10.04/trace/Mmakefile	2010-07-25 20:05:55.000000000 +1200
+@@ -324,6 +324,9 @@
+ 
+ # there is no tracing in the .NET, Java, Erlang backends
+ 
++.PHONY: libgrade
++libgrade:
++
+ .PHONY: install_headers
+ install_headers:
+ 
+@@ -332,6 +335,13 @@
+ 
+ else
+ 
++.PHONY: libgrade
++libgrade: \
++		lib$(TRACE_LIB_NAME).$A \
++		lib$(TRACE_LIB_NAME).$(EXT_FOR_SHARED_LIB) \
++		lib$(EVENTSPEC_LIB_NAME).$A \
++		lib$(EVENTSPEC_LIB_NAME).$(EXT_FOR_SHARED_LIB)
++
+ .PHONY: install_headers
+ install_headers: $(HDRS) $(LIB_GLOBALS_H)
+ 	cp `vpath_find $(HDRS) $(LIB_GLOBALS_H)` $(INSTALL_INC_DIR)
diff --git a/dev-lang/mercury/mercury-10.04.ebuild b/dev-lang/mercury/mercury-10.04.ebuild
index 8ca605ec33ff..ac4091ade649 100644
--- a/dev-lang/mercury/mercury-10.04.ebuild
+++ b/dev-lang/mercury/mercury-10.04.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild,v 1.2 2010/07/24 00:05:32 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild,v 1.3 2010/07/25 08:45:23 keri Exp $
 
 inherit elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
 
@@ -35,6 +35,7 @@ src_unpack() {
 	unpack ${A}
 
 	epatch "${FILESDIR}"/${P}-multilib.patch
+	epatch "${FILESDIR}"/${P}-libgrades.patch
 	epatch "${FILESDIR}"/${P}-boehm_gc.patch
 	epatch "${FILESDIR}"/${P}-docs.patch
 	epatch "${FILESDIR}"/${P}-no-reconf.patch
@@ -73,11 +74,25 @@ src_compile() {
 		PARALLEL=${MAKEOPTS} \
 		EXTRA_MLFLAGS=--no-strip \
 		|| die "emake failed"
+
+	emake \
+		PARALLEL=${MAKEOPTS} \
+		EXTRA_MLFLAGS=--no-strip \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		libgrades || die "emake libgrades failed"
 }
 
 src_test() {
 	TEST_GRADE=`scripts/ml --print-grade`
-	TWS="${S}"
+	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
+		TWS="${S}"/install_grade_dir.${TEST_GRADE}
+		cp browser/mer_browser.init "${TWS}"/browser/
+		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
+		cp runtime/mer_rt.init "${TWS}"/runtime/
+		cp ssdb/mer_ssdb.init "${TWS}"/ssdb/
+	else
+		TWS="${S}"
+	fi
 
 	cd "${TESTDIR}"
 	sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws
@@ -126,7 +141,7 @@ src_install() {
 	fi
 
 	if use java; then
-		dodoc README.java
+		dodoc README.Java
 	fi
 }