Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Keri Harris (keri)" <keri@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/mercury/files: mercury-10.04.1-sparc-llds-base-grade.patch mercury-10.04.1-char-det-from-int.patch mercury-10.04.1-bootstrap-depend.patch mercury-10.04.1-tests-workspace.patch
Date: Sun, 10 Oct 2010 01:03:40
Message-Id: 20101010000947.526A82003C@flycatcher.gentoo.org
1 keri 10/10/10 00:09:47
2
3 Modified: mercury-10.04.1-sparc-llds-base-grade.patch
4 mercury-10.04.1-char-det-from-int.patch
5 mercury-10.04.1-tests-workspace.patch
6 Added: mercury-10.04.1-bootstrap-depend.patch
7 Log:
8 Run mmake depend when bootstrapping mercury_compile
9 (Portage version: 2.1.8.3/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.2 dev-lang/mercury/files/mercury-10.04.1-sparc-llds-base-grade.patch
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-sparc-llds-base-grade.patch?rev=1.2&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-sparc-llds-base-grade.patch?rev=1.2&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-sparc-llds-base-grade.patch?r1=1.1&r2=1.2
17
18 Index: mercury-10.04.1-sparc-llds-base-grade.patch
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-sparc-llds-base-grade.patch,v
21 retrieving revision 1.1
22 retrieving revision 1.2
23 diff -u -r1.1 -r1.2
24 --- mercury-10.04.1-sparc-llds-base-grade.patch 5 Sep 2010 05:48:08 -0000 1.1
25 +++ mercury-10.04.1-sparc-llds-base-grade.patch 10 Oct 2010 00:09:47 -0000 1.2
26 @@ -1,7 +1,6 @@
27 -diff -ur mercury-compiler-10.04.1.orig/configure mercury-compiler-10.04.1/configure
28 ---- mercury-compiler-10.04.1.orig/configure 2010-08-29 19:27:34.000000000 +1200
29 -+++ mercury-compiler-10.04.1/configure 2010-09-05 09:11:36.000000000 +1200
30 -@@ -10805,7 +10805,7 @@
31 +--- mercury-compiler-10.04.1.orig/configure.in 2010-08-23 23:04:53.000000000 +1200
32 ++++ mercury-compiler-10.04.1/configure.in 2010-10-10 11:45:32.000000000 +1300
33 +@@ -3079,7 +3079,7 @@
34 # The asm_fast and reg grades also do not currently work on Linux/PPC.
35 #
36 case "$host" in
37
38
39
40 1.2 dev-lang/mercury/files/mercury-10.04.1-char-det-from-int.patch
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-char-det-from-int.patch?rev=1.2&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-char-det-from-int.patch?rev=1.2&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-char-det-from-int.patch?r1=1.1&r2=1.2
45
46 Index: mercury-10.04.1-char-det-from-int.patch
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-char-det-from-int.patch,v
49 retrieving revision 1.1
50 retrieving revision 1.2
51 diff -u -r1.1 -r1.2
52 --- mercury-10.04.1-char-det-from-int.patch 12 Sep 2010 03:17:24 -0000 1.1
53 +++ mercury-10.04.1-char-det-from-int.patch 10 Oct 2010 00:09:47 -0000 1.2
54 @@ -1,12 +1,12 @@
55 ---- mercury-compiler-10.04.1.orig/configure 2010-08-29 19:27:34.000000000 +1200
56 -+++ mercury-compiler-10.04.1/configure 2010-09-12 12:59:51.000000000 +1200
57 -@@ -3412,7 +3412,8 @@
58 +--- mercury-compiler-10.04.1.orig/configure.in 2010-08-23 23:04:53.000000000 +1200
59 ++++ mercury-compiler-10.04.1/configure.in 2010-10-10 11:39:59.000000000 +1300
60 +@@ -309,7 +309,8 @@
61 Version >= 8,
62 ac(2) ^ elem(3, 5) = 17,
63 - (1 .. 2) = [1, 2],
64 + (1 .. 2) = [[1, 2]],
65 - Global = 561
66 + Global = 561,
67 + char.det_from_int(255) = '\xFF\'
68 ->
69 - trace [io(!S)] (
70 + trace [[io(!S)]] (
71 io.print("Hello, world\n", !S)
72
73
74
75 1.2 dev-lang/mercury/files/mercury-10.04.1-tests-workspace.patch
76
77 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-tests-workspace.patch?rev=1.2&view=markup
78 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-tests-workspace.patch?rev=1.2&content-type=text/plain
79 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-tests-workspace.patch?r1=1.1&r2=1.2
80
81 Index: mercury-10.04.1-tests-workspace.patch
82 ===================================================================
83 RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-tests-workspace.patch,v
84 retrieving revision 1.1
85 retrieving revision 1.2
86 diff -u -r1.1 -r1.2
87 --- mercury-10.04.1-tests-workspace.patch 5 Sep 2010 05:48:08 -0000 1.1
88 +++ mercury-10.04.1-tests-workspace.patch 10 Oct 2010 00:09:47 -0000 1.2
89 @@ -11,9 +11,9 @@
90 endif
91
92 # Avoid trying to make this file with `mmc --make' if it doesn't exist.
93 ---- mercury-compiler-10.04.1.orig/configure 2010-08-29 19:27:34.000000000 +1200
94 -+++ mercury-compiler-10.04.1/configure 2010-09-05 09:37:11.000000000 +1200
95 -@@ -14798,10 +14798,10 @@
96 +--- mercury-compiler-10.04.1.orig/configure.in 2010-08-23 23:04:53.000000000 +1200
97 ++++ mercury-compiler-10.04.1/configure.in 2010-10-10 11:49:06.000000000 +1300
98 +@@ -5048,10 +5048,10 @@
99 test_flags="tests/TESTS_FLAGS"
100 test_mdbrc="tests/mdbrc"
101 else
102
103
104
105 1.1 dev-lang/mercury/files/mercury-10.04.1-bootstrap-depend.patch
106
107 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-bootstrap-depend.patch?rev=1.1&view=markup
108 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-bootstrap-depend.patch?rev=1.1&content-type=text/plain
109
110 Index: mercury-10.04.1-bootstrap-depend.patch
111 ===================================================================
112 --- mercury-compiler-10.04.1.orig/Mmakefile 2009-10-20 17:07:24.000000000 +1300
113 +++ mercury-compiler-10.04.1/Mmakefile 2010-10-10 10:05:55.000000000 +1300
114 @@ -167,6 +167,13 @@
115 library/$(deps_subdir)$(STD_LIB_NAME).dep
116 +cd deep_profiler && $(SUBDIR_MMAKE) depend
117
118 +.PHONY: bootstrap_depend
119 +ifeq ("$(BOOTSTRAP_MC)","")
120 +bootstrap_depend:
121 +else
122 +bootstrap_depend: depend
123 +endif
124 +
125 # depend_library MUST be done before depend_compiler and depend_profiler
126
127 .PHONY: depend
128 --- mercury-compiler-10.04.1.orig/Mmake.common.in 2009-10-10 23:44:13.000000000 +1300
129 +++ mercury-compiler-10.04.1/Mmake.common.in 2010-10-10 10:21:52.000000000 +1300
130 @@ -30,6 +30,7 @@
131
132 # Specify the Mercury compiler to use for bootstrapping.
133 MC = @BOOTSTRAP_MC_COMPILER@
134 +BOOTSTRAP_MC = @BOOTSTRAP_MC@
135
136 # Specify the compilation model to use for compiling the compiler.
137 GRADE = @GRADE@
138 --- mercury-compiler-10.04.1.orig/configure.in 2010-08-23 23:04:53.000000000 +1200
139 +++ mercury-compiler-10.04.1/configure.in 2010-10-10 11:42:43.000000000 +1300
140 @@ -4426,11 +4426,11 @@
141 #-----------------------------------------------------------------------------#
142
143 if test "$BOOTSTRAP_MC" = ""; then
144 - BOOTSTRAP_MC=mmc
145 + BOOTSTRAP_MC_COMPILER=mmc
146 +else
147 + BOOTSTRAP_MC_COMPILER="$BOOTSTRAP_MC"
148 fi
149 -BOOTSTRAP_MC_COMPILER="$BOOTSTRAP_MC"
150 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"
151 -BOOTSTRAP_MC="$BOOTSTRAP_MC_COMPILER $BOOTSTRAP_MC_ARGS"
152 AC_SUBST(BOOTSTRAP_MC_COMPILER)
153 AC_SUBST(BOOTSTRAP_MC_ARGS)
154 AC_SUBST(BOOTSTRAP_MC)
Report Message
Find on MARC Find on Google Groups