Run mmake depend when bootstrapping mercury_compile

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

7 files changed, 79 insertions, 21 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index ffe9974d201d..108417933947 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,13 @@
 # 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.116 2010/09/12 03:17:24 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.117 2010/10/10 00:09:47 keri Exp $
+
+  09 Oct 2010; <keri@gentoo.org> mercury-10.04.1.ebuild,
+  +files/mercury-10.04.1-bootstrap-depend.patch,
+  files/mercury-10.04.1-char-det-from-int.patch,
+  files/mercury-10.04.1-sparc-llds-base-grade.patch,
+  files/mercury-10.04.1-tests-workspace.patch:
+  Run mmake depend when bootstrapping mercury_compile
 
   12 Sep 2010; <keri@gentoo.org> mercury-10.04.1.ebuild,
   +files/mercury-10.04.1-char-det-from-int.patch:
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 32f04249ffe5..a7c8523129ed 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -21,16 +21,17 @@ AUX mercury-10.04-tests-sandbox.patch 2932 RMD160 2cb2b82e4d282c31ecfd350e732f5c
 AUX mercury-10.04-tests-static-link.patch 568 RMD160 72a38e289d1e7f76e4dfdae21c42322d452b8fcf SHA1 76b78ee37ac2b3ef4ddc804485d7bd10a9720dff SHA256 f37e8399aed753a947062d40573ba5205ef62ecfbbe87ecb8632cf1895002663
 AUX mercury-10.04-tests-workspace.patch 1058 RMD160 34f0623fdf595bdd4c098cf57573178a622fc4e4 SHA1 e6afeec2e55d8b61dbf6359fb03289534059f86c SHA256 7551204ad0bd0fdbe6b17d29bd44d7ab4ae5a1f1b51d32391e368bbb747a3d1d
 AUX mercury-10.04.1-boehm_gc.patch 5932 RMD160 a7432297f4a03af8072444f05d1f3a22282620cb SHA1 c98916c2459e677b34e6fbfbd163a89a4571b22b SHA256 eb88c6a4560e6bb7adf2b27271543bdd4bc9b69bde726109ef719fcaeb48585a
-AUX mercury-10.04.1-char-det-from-int.patch 499 RMD160 39c971c8694aeb5c644d40b55e994b00c4d0615b SHA1 34d6177c0fbc2a4f6d541f48038abe05ab64daca SHA256 8586424eee7d23632b9a7a3ff336404edfb8a755d62cdb9e31b6355f5dfcc506
+AUX mercury-10.04.1-bootstrap-depend.patch 1605 RMD160 ae6c62b0cf7d23254fcc486f5b64ba9d970774e6 SHA1 32449197095bac791c6c877019bf16e41a7f3677 SHA256 137f1349c17ec357f215892eba9d1cd5b3c276e70137ab303feba6495522fba1
+AUX mercury-10.04.1-char-det-from-int.patch 507 RMD160 b620007cd4c161ac51ba3417b0ff8fe1427670ec SHA1 92bfab764bb57fad2a5e5087dea2a28586986e55 SHA256 125794808c1b222bd97c43f205dbe678c0dc0edc0204f6a6df304f80a037c2b2
 AUX mercury-10.04.1-default-grade.patch 9273 RMD160 d66b819f9a21e07de7cccda39c64c87c5cb2f1da SHA1 459b5340fd57035843a85b883432c2a96ca6b5f4 SHA256 41b5329f001812584eba7b9a70553cc09bfaff9c66baff2a64305625111942ee
 AUX mercury-10.04.1-docs.patch 890 RMD160 03cbff1254b61261cbca8fa2d518f02c3544bf42 SHA1 327891efea1c84d68326564e435ea093b91fc262 SHA256 492b3a92e93359330648f51f8b82d9d8b7addb22ba56bd7bfc8489aaedbc1764
 AUX mercury-10.04.1-linker-flags.patch 3661 RMD160 ad568f11077e30a4dadfd96a31b32bdf832c00e0 SHA1 235e88def696d2588a0ea7ede2df15cfafc276dd SHA256 3a4d1cceffcb5e659a0e7910a1d538099bd1c6aded524d67c8d4854c4f359d2f
 AUX mercury-10.04.1-multilib.patch 11698 RMD160 cc84d5b4cb35ccbb143903ad74991ccda760774b SHA1 8b476a0822570ad663dd8b29f6da37d9dd0c8272 SHA256 f247d7f8b312e1dca80b203bd7fd7e56ec79669b4de89eb4efc662dc8a50d4d3
 AUX mercury-10.04.1-no-reconf.patch 2058 RMD160 b94029c812ad662f8ec95eabebfc30451b2d0fb0 SHA1 c273f5ffa5b89dd52b04f60a7c3e61b6ca5e3c1e SHA256 f2edfaa6f7944357e9aebe0e916b6c7b8db604a419af0be8a989d74f30a19c85
-AUX mercury-10.04.1-sparc-llds-base-grade.patch 555 RMD160 8e109c99d239336f6268ab2d7866c4a454c474b5 SHA1 76344d65560488627d7f485e7b91211d4c422b3b SHA256 64944f246a102867ee24538533603e179c9bd8324dfdcf04dcc6cbcb3237d707
+AUX mercury-10.04.1-sparc-llds-base-grade.patch 475 RMD160 0595dec723fb51333e489ab26aec5692a7761a4e SHA1 e5b0d5650d5b1641c7a989fff479c660c7761b51 SHA256 abad03efd5f4b4030cbf1888ca536abd1f01813886d79d0a69d34f640924479b
 AUX mercury-10.04.1-tests-sandbox.patch 2972 RMD160 beaac1ff68613a165c273f6f463c94372095bba2 SHA1 2819c6dbb1d80983581f39eb3e7da265240018fa SHA256 619a33f5e944b6899fed6dc178abfef811554d60bca716dc972bf200aef4a41f
 AUX mercury-10.04.1-tests-static-link.patch 572 RMD160 cd7c1e31cde2e3f3264b9037cb8eec58d3fbbb15 SHA1 8375c73e51d10a59a5679fc17227b03c4b4517fe SHA256 a2bab04b4c91b76ba1cffe6d5bf2d769cb3bdeaa8537e0629898ba24815b4e14
-AUX mercury-10.04.1-tests-workspace.patch 1072 RMD160 5dcaaa165622d434248b4705594e31d93a5bab19 SHA1 0f098ef3547c3ea1cf998413f7e364dddd39429a SHA256 476eb36def1e0e55e07b059bceb2cf070a10feb596aa0691d52528de44306adb
+AUX mercury-10.04.1-tests-workspace.patch 1076 RMD160 3357f508e955e2bb2456834deb1da84ae6e04d7c SHA1 8a83a3a080edba16f63f45b08ba9c4725abcee87 SHA256 9fe6b5b6c9ff4344e67f2719cf7361eb0090398a6910009ac406d6df1e288fe4
 AUX mercury-10.04_beta1-atomic-ops.patch 568 RMD160 e557798f12ac9325ed6b251c1bc7dc87d36e1225 SHA1 0ea7f1c346b69aa73d387b5bdee12e34e482b129 SHA256 90720443306685422a7c2bf9f3fa2193feef4eda71de38a474cc0303381ce5e1
 AUX mercury-10.04_beta1-boehm_gc.patch 4231 RMD160 a8f7f12d5768156de83d90362e81094084f3fd35 SHA1 8a595992e162f48ccacb63fb6df497e361901f2c SHA256 45eafb8b94538336f0de13085359aa1b9998fd2c99d67c735b71f4e09b8e786e
 AUX mercury-10.04_beta1-docs.patch 804 RMD160 8b04f68882da22485d6db8c1a0184d37870dc2b5 SHA1 efdb8948178b9287664bd8ad6e8896b10affb213 SHA256 55bafac83acd9da404da9b626ab7a6e137a13f1169c9612caa6908f2f7152096
@@ -50,8 +51,8 @@ DIST mercury-tests-10.04.1.tar.gz 1332741 RMD160 e7880a095d071f4fcdce69f9e656e67
 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-r1.ebuild 4397 RMD160 ac0c5f73a0468ad0b975c7b4e45fd962cd3d1b42 SHA1 b7d1d4b635f916f1be1a4fc496c2d80f9949ab30 SHA256 55dfdb3ae95f0dfc74014d2f87085d568316c84d78d74805e30c8674f8ece543
-EBUILD mercury-10.04.1.ebuild 4775 RMD160 28585e703f832487d41f09c1c2faaaf1bd964599 SHA1 cf7ade7b40c8595d28da3c55eb20b7ee40b1c521 SHA256 55699c4544b0cd97e2103bc555db6034bce40231f0a583310602cfe531d4f1dc
+EBUILD mercury-10.04.1.ebuild 4915 RMD160 cac82413b0a1aa53998a83e07b94f1223f2a9ba1 SHA1 6754bbe32a7c4640d3aaf9df80dc30c59ba5d1eb SHA256 4cdaf57b11824775f6095cc0df92bf8b563acddf64a6e8d27b0c92155046f8f6
 EBUILD mercury-10.04.ebuild 4150 RMD160 565ad36c8253f0da62f6a4256cbf45d2655a6223 SHA1 3f6363b22b7b4dcd0fe731f404d6d8dadb6cebff SHA256 943ee918a3113d45d268f4091de5a0767d05e99194f121771ce43c3a9c71eba0
 EBUILD mercury-10.04_beta1.ebuild 3561 RMD160 b608b732acdfccb4a8ccdc4728bdd0b9f3f28283 SHA1 319302199665f6e4ffa9aaff95128fcd8a7d63a0 SHA256 ffbba59515166327f79a698086d516f14fcbcfc8c76f58dbf1116eaa8eb16626
-MISC ChangeLog 23652 RMD160 b3aa01f59b8abea586219653ad7ffe3579644f33 SHA1 1e2754c9d0b46df34fef7e443198ca1c796714df SHA256 4db07df86653c308d3aba20ae3340680c765926fc147d723056ede725a7e2ccf
+MISC ChangeLog 23962 RMD160 663b7ecdd06ad35441679aba54c40093e37fcb63 SHA1 352de32a56aa0661ee01a252e1826c17332f7599 SHA256 1ee20dc95be1cc93f915e444b6f24b53bfc8c218c93f744c288b94361dc2cece
 MISC metadata.xml 318 RMD160 b9e62c5b9d04f43a6570cfcadd6a6c9a2b9e3f6f SHA1 67893d667419e727696eb2c386565794fd137418 SHA256 5e64767eb2ff6b10d88b169c87648d62b534356fb94c5407a253aeafc2d16935
diff --git a/dev-lang/mercury/files/mercury-10.04.1-bootstrap-depend.patch b/dev-lang/mercury/files/mercury-10.04.1-bootstrap-depend.patch
new file mode 100644
index 000000000000..955cf45de4e6
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-10.04.1-bootstrap-depend.patch
@@ -0,0 +1,43 @@
+--- mercury-compiler-10.04.1.orig/Mmakefile	2009-10-20 17:07:24.000000000 +1300
++++ mercury-compiler-10.04.1/Mmakefile	2010-10-10 10:05:55.000000000 +1300
+@@ -167,6 +167,13 @@
+ 		library/$(deps_subdir)$(STD_LIB_NAME).dep
+ 	+cd deep_profiler && $(SUBDIR_MMAKE) depend
+ 
++.PHONY: bootstrap_depend
++ifeq ("$(BOOTSTRAP_MC)","")
++bootstrap_depend:
++else
++bootstrap_depend: depend
++endif
++
+ # depend_library MUST be done before depend_compiler and depend_profiler
+ 
+ .PHONY: depend
+--- mercury-compiler-10.04.1.orig/Mmake.common.in	2009-10-10 23:44:13.000000000 +1300
++++ mercury-compiler-10.04.1/Mmake.common.in	2010-10-10 10:21:52.000000000 +1300
+@@ -30,6 +30,7 @@
+ 
+ # Specify the Mercury compiler to use for bootstrapping.
+ MC		= @BOOTSTRAP_MC_COMPILER@
++BOOTSTRAP_MC    = @BOOTSTRAP_MC@
+ 
+ # Specify the compilation model to use for compiling the compiler.
+ GRADE		= @GRADE@
+--- mercury-compiler-10.04.1.orig/configure.in	2010-08-23 23:04:53.000000000 +1200
++++ mercury-compiler-10.04.1/configure.in	2010-10-10 11:42:43.000000000 +1300
+@@ -4426,11 +4426,11 @@
+ #-----------------------------------------------------------------------------#
+ 
+ if test "$BOOTSTRAP_MC" = ""; then
+-    BOOTSTRAP_MC=mmc
++    BOOTSTRAP_MC_COMPILER=mmc
++else
++    BOOTSTRAP_MC_COMPILER="$BOOTSTRAP_MC"
+ fi
+-BOOTSTRAP_MC_COMPILER="$BOOTSTRAP_MC"
+ BOOTSTRAP_MC_ARGS="$HAVE_BOXED_FLOATS --conf-low-tag-bits $LOW_TAG_BITS --bits-per-word $BITS_PER_WORD --bytes-per-word $BYTES_PER_WORD"
+-BOOTSTRAP_MC="$BOOTSTRAP_MC_COMPILER $BOOTSTRAP_MC_ARGS"
+ AC_SUBST(BOOTSTRAP_MC_COMPILER)
+ AC_SUBST(BOOTSTRAP_MC_ARGS)
+ AC_SUBST(BOOTSTRAP_MC)
diff --git a/dev-lang/mercury/files/mercury-10.04.1-char-det-from-int.patch b/dev-lang/mercury/files/mercury-10.04.1-char-det-from-int.patch
index 6440854baf8d..8a6e8824048f 100644
--- a/dev-lang/mercury/files/mercury-10.04.1-char-det-from-int.patch
+++ b/dev-lang/mercury/files/mercury-10.04.1-char-det-from-int.patch
@@ -1,12 +1,12 @@
---- mercury-compiler-10.04.1.orig/configure	2010-08-29 19:27:34.000000000 +1200
-+++ mercury-compiler-10.04.1/configure	2010-09-12 12:59:51.000000000 +1200
-@@ -3412,7 +3412,8 @@
+--- mercury-compiler-10.04.1.orig/configure.in	2010-08-23 23:04:53.000000000 +1200
++++ mercury-compiler-10.04.1/configure.in	2010-10-10 11:39:59.000000000 +1300
+@@ -309,7 +309,8 @@
                  Version >= 8,
                  ac(2) ^ elem(3, 5) = 17,
-                 (1 .. 2) = [1, 2],
+                 (1 .. 2) = [[1, 2]],
 -                Global = 561
 +                Global = 561,
 +                char.det_from_int(255) = '\xFF\'
              ->
-                 trace [io(!S)] (
+                 trace [[io(!S)]] (
                      io.print("Hello, world\n", !S)
diff --git a/dev-lang/mercury/files/mercury-10.04.1-sparc-llds-base-grade.patch b/dev-lang/mercury/files/mercury-10.04.1-sparc-llds-base-grade.patch
index 424e123a1699..67f83705eb02 100644
--- a/dev-lang/mercury/files/mercury-10.04.1-sparc-llds-base-grade.patch
+++ b/dev-lang/mercury/files/mercury-10.04.1-sparc-llds-base-grade.patch
@@ -1,7 +1,6 @@
-diff -ur mercury-compiler-10.04.1.orig/configure mercury-compiler-10.04.1/configure
---- mercury-compiler-10.04.1.orig/configure	2010-08-29 19:27:34.000000000 +1200
-+++ mercury-compiler-10.04.1/configure	2010-09-05 09:11:36.000000000 +1200
-@@ -10805,7 +10805,7 @@
+--- mercury-compiler-10.04.1.orig/configure.in	2010-08-23 23:04:53.000000000 +1200
++++ mercury-compiler-10.04.1/configure.in	2010-10-10 11:45:32.000000000 +1300
+@@ -3079,7 +3079,7 @@
  # The asm_fast and reg grades also do not currently work on Linux/PPC.
  #
  case "$host" in
diff --git a/dev-lang/mercury/files/mercury-10.04.1-tests-workspace.patch b/dev-lang/mercury/files/mercury-10.04.1-tests-workspace.patch
index a0a6968a560a..e68899edfe92 100644
--- a/dev-lang/mercury/files/mercury-10.04.1-tests-workspace.patch
+++ b/dev-lang/mercury/files/mercury-10.04.1-tests-workspace.patch
@@ -11,9 +11,9 @@
  endif
  
  # Avoid trying to make this file with `mmc --make' if it doesn't exist.
---- mercury-compiler-10.04.1.orig/configure	2010-08-29 19:27:34.000000000 +1200
-+++ mercury-compiler-10.04.1/configure	2010-09-05 09:37:11.000000000 +1200
-@@ -14798,10 +14798,10 @@
+--- mercury-compiler-10.04.1.orig/configure.in	2010-08-23 23:04:53.000000000 +1200
++++ mercury-compiler-10.04.1/configure.in	2010-10-10 11:49:06.000000000 +1300
+@@ -5048,10 +5048,10 @@
      test_flags="tests/TESTS_FLAGS"
      test_mdbrc="tests/mdbrc"
  else
diff --git a/dev-lang/mercury/mercury-10.04.1.ebuild b/dev-lang/mercury/mercury-10.04.1.ebuild
index 2b0e1de3eab2..8386c60c226b 100644
--- a/dev-lang/mercury/mercury-10.04.1.ebuild
+++ b/dev-lang/mercury/mercury-10.04.1.ebuild
@@ -1,8 +1,8 @@
 # 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.1.ebuild,v 1.2 2010/09/12 03:17:24 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.1.ebuild,v 1.3 2010/10/10 00:09:47 keri Exp $
 
-inherit elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
+inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
 
 MY_P=${PN}-compiler-${PV}
 
@@ -36,6 +36,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${P}-multilib.patch
 	epatch "${FILESDIR}"/${P}-linker-flags.patch
+	epatch "${FILESDIR}"/${P}-bootstrap-depend.patch
 	epatch "${FILESDIR}"/${P}-default-grade.patch
 	epatch "${FILESDIR}"/${P}-boehm_gc.patch
 	epatch "${FILESDIR}"/${P}-sparc-llds-base-grade.patch
@@ -65,6 +66,9 @@ src_unpack() {
 		epatch "${FILESDIR}"/${P}-tests-sandbox.patch
 		epatch "${FILESDIR}"/${P}-tests-static-link.patch
 	fi
+
+	cd "${S}"
+	eautoreconf
 }
 
 src_compile() {
@@ -73,7 +77,6 @@ src_compile() {
 	local myconf
 	myconf="--libdir=/usr/$(get_libdir) \
 		--disable-gcc-back-end \
-		--disable-aditi-back-end \
 		--disable-deep-profiler \
 		--disable-dotnet-grades \
 		$(use_enable erlang erlang-grade) \
@@ -86,6 +89,11 @@ src_compile() {
 	econf \
 		${myconf} \
 		|| die "econf failed"
+
+	emake \
+		PARALLEL=${MAKEOPTS} \
+		bootstrap_depend || die "emake depend failed"
+
 	emake \
 		PARALLEL=${MAKEOPTS} \
 		EXTRA_MLFLAGS=--no-strip \