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-multilib.patch mercury-10.04.1-sparc-llds-base-grade.patch mercury-10.04.1-tests-static-link.patch mercury-10.04.1-tests-sandbox.patch mercury-10.04.1-default-grade.patch mercury-10.04.1-docs.patch mercury-10.04.1-no-reconf.patch mercury-10.04.1-boehm_gc.patch mercury-10.04.1-linker-flags.patch mercury-10.04.1-tests-workspace.patch
Date: Sun, 05 Sep 2010 05:48:15
Message-Id: 20100905054809.15F4820051@flycatcher.gentoo.org
1 keri 10/09/05 05:48:08
2
3 Added: mercury-10.04.1-multilib.patch
4 mercury-10.04.1-sparc-llds-base-grade.patch
5 mercury-10.04.1-tests-static-link.patch
6 mercury-10.04.1-tests-sandbox.patch
7 mercury-10.04.1-default-grade.patch
8 mercury-10.04.1-docs.patch
9 mercury-10.04.1-no-reconf.patch
10 mercury-10.04.1-boehm_gc.patch
11 mercury-10.04.1-linker-flags.patch
12 mercury-10.04.1-tests-workspace.patch
13 Log:
14 Version bump
15 (Portage version: 2.1.8.3/cvs/Linux x86_64)
16
17 Revision Changes Path
18 1.1 dev-lang/mercury/files/mercury-10.04.1-multilib.patch
19
20 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-multilib.patch?rev=1.1&view=markup
21 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-multilib.patch?rev=1.1&content-type=text/plain
22
23 Index: mercury-10.04.1-multilib.patch
24 ===================================================================
25 diff -ur mercury-compiler-10.04.1.orig/compiler/file_util.m mercury-compiler-10.04.1/compiler/file_util.m
26 --- mercury-compiler-10.04.1.orig/compiler/file_util.m 2009-10-14 18:28:32.000000000 +1300
27 +++ mercury-compiler-10.04.1/compiler/file_util.m 2010-09-05 15:35:56.000000000 +1200
28 @@ -261,7 +261,7 @@
29 ( InstallNamePath0 = "" ->
30 globals.lookup_string_option(Globals, install_prefix, InstallPrefix),
31 grade_directory_component(Globals, GradeDir),
32 - InstallNamePath = InstallPrefix / "lib" / "mercury" / "lib" / GradeDir
33 + InstallNamePath = InstallPrefix / "@libdir@" / "mercury" / "lib" / GradeDir
34 ;
35 InstallNamePath = InstallNamePath0
36 ),
37 diff -ur mercury-compiler-10.04.1.orig/compiler/libs.file_util.c mercury-compiler-10.04.1/compiler/libs.file_util.c
38 --- mercury-compiler-10.04.1.orig/compiler/libs.file_util.c 2010-08-30 04:35:03.000000000 +1200
39 +++ mercury-compiler-10.04.1/compiler/libs.file_util.c 2010-09-05 11:29:44.000000000 +1200
40 @@ -856,7 +856,7 @@
41 MR_tempr1 = MR_sv(1);
42 MR_sv(1) = MR_r1;
43 MR_r1 = MR_tempr1;
44 - MR_r2 = (MR_Word) MR_string_const("lib", 3);
45 + MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
46 }
47 MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
48 libs__file_util__get_install_name_option_3_0_i8);
49 diff -ur mercury-compiler-10.04.1.orig/compiler/make.program_target.c mercury-compiler-10.04.1/compiler/make.program_target.c
50 --- mercury-compiler-10.04.1.orig/compiler/make.program_target.c 2010-08-30 04:37:52.000000000 +1200
51 +++ mercury-compiler-10.04.1/compiler/make.program_target.c 2010-09-05 08:58:59.000000000 +1200
52 @@ -5422,7 +5422,7 @@
53 make__program_target__install_grade_init_6_0_i2);
54 MR_def_label(make__program_target__install_grade_init_6_0,2)
55 MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
56 - MR_r2 = (MR_Word) MR_string_const("lib", 3);
57 + MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
58 MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
59 make__program_target__install_grade_init_6_0_i3);
60 MR_def_label(make__program_target__install_grade_init_6_0,3)
61 @@ -5873,7 +5873,7 @@
62 make__program_target__make_grade_install_dirs_6_0_i2);
63 MR_def_label(make__program_target__make_grade_install_dirs_6_0,2)
64 MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
65 - MR_r2 = (MR_Word) MR_string_const("lib", 3);
66 + MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
67 MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
68 make__program_target__make_grade_install_dirs_6_0_i3);
69 MR_def_label(make__program_target__make_grade_install_dirs_6_0,3)
70 @@ -6318,7 +6318,7 @@
71 MR_GOTO_LAB(make__program_target__install_library_grade_files_10_0_i11);
72 }
73 MR_r1 = MR_sv(10);
74 - MR_r2 = (MR_Word) MR_string_const("lib", 3);
75 + MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
76 MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
77 make__program_target__install_library_grade_files_10_0_i14);
78 MR_def_label(make__program_target__install_library_grade_files_10_0,14)
79 @@ -6382,7 +6382,7 @@
80 MR_GOTO_LAB(make__program_target__install_library_grade_files_10_0_i20);
81 }
82 MR_r1 = MR_sv(10);
83 - MR_r2 = (MR_Word) MR_string_const("lib", 3);
84 + MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
85 MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
86 make__program_target__install_library_grade_files_10_0_i23);
87 MR_def_label(make__program_target__install_library_grade_files_10_0,23)
88 @@ -6448,7 +6448,7 @@
89 MR_def_label(make__program_target__install_library_grade_files_10_0,20)
90 MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
91 MR_r1 = MR_sv(10);
92 - MR_r2 = (MR_Word) MR_string_const("lib", 3);
93 + MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
94 MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
95 make__program_target__install_library_grade_files_10_0_i30);
96 MR_def_label(make__program_target__install_library_grade_files_10_0,30)
97 @@ -6585,7 +6585,7 @@
98 make__program_target__make_install_dirs_5_0_i2);
99 MR_def_label(make__program_target__make_install_dirs_5_0,2)
100 MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
101 - MR_r2 = (MR_Word) MR_string_const("lib", 3);
102 + MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
103 MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
104 make__program_target__make_install_dirs_5_0_i3);
105 MR_def_label(make__program_target__make_install_dirs_5_0,3)
106 @@ -6806,7 +6806,7 @@
107 make__program_target__install_library_7_0_i11);
108 MR_def_label(make__program_target__install_library_7_0,11)
109 MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
110 - MR_r2 = (MR_Word) MR_string_const("lib", 3);
111 + MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
112 MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
113 make__program_target__install_library_7_0_i12);
114 MR_def_label(make__program_target__install_library_7_0,12)
115 @@ -10596,7 +10596,7 @@
116 make__program_target__install_ints_and_headers_8_0_i13);
117 MR_def_label(make__program_target__install_ints_and_headers_8_0,13)
118 MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
119 - MR_r2 = (MR_Word) MR_string_const("lib", 3);
120 + MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
121 MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
122 make__program_target__install_ints_and_headers_8_0_i14);
123 MR_def_label(make__program_target__install_ints_and_headers_8_0,14)
124 @@ -11222,7 +11222,7 @@
125 make__program_target__install_grade_ints_and_headers_9_0_i5);
126 MR_def_label(make__program_target__install_grade_ints_and_headers_9_0,5)
127 MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
128 - MR_r2 = (MR_Word) MR_string_const("lib", 3);
129 + MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
130 MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
131 make__program_target__install_grade_ints_and_headers_9_0_i6);
132 MR_def_label(make__program_target__install_grade_ints_and_headers_9_0,6)
133 diff -ur mercury-compiler-10.04.1.orig/compiler/make.program_target.m mercury-compiler-10.04.1/compiler/make.program_target.m
134 --- mercury-compiler-10.04.1.orig/compiler/make.program_target.m 2010-05-20 21:29:30.000000000 +1200
135 +++ mercury-compiler-10.04.1/compiler/make.program_target.m 2010-09-05 15:35:08.000000000 +1200
136 @@ -1370,7 +1370,7 @@
137 ),
138
139 globals.lookup_string_option(Globals, install_prefix, Prefix),
140 - LibDir = Prefix/"lib"/"mercury",
141 + LibDir = Prefix/"@libdir@"/"mercury",
142 list.map_foldl(
143 install_subdir_file(Globals, SubdirLinkSucceeded, LibDir/"ints",
144 ModuleName),
145 @@ -1424,7 +1424,7 @@
146 globals.lookup_accumulating_option(Globals, extra_library_header,
147 ExtraHdrs),
148 globals.lookup_string_option(Globals, install_prefix, Prefix),
149 - IncDir = Prefix / "lib" / "mercury" / "inc",
150 + IncDir = Prefix / "@libdir@" / "mercury" / "inc",
151 list.foldl2(install_extra_header(Globals, IncDir), ExtraHdrs,
152 yes, ExtraHdrsSucceeded, !IO).
153
154 @@ -1572,19 +1572,19 @@
155 globals.lookup_string_option(Globals, install_prefix, Prefix),
156
157 ( string.prefix(GradeDir, "java") ->
158 - GradeLibDir = Prefix/"lib"/"mercury"/"lib"/GradeDir,
159 + GradeLibDir = Prefix/"@libdir@"/"mercury"/"lib"/GradeDir,
160 install_file(Globals, JarFileName, GradeLibDir, LibsSucceeded,
161 !IO),
162 InitSucceeded = yes
163 ; string.prefix(GradeDir, "erlang") ->
164 - GradeLibDir = Prefix/"lib"/"mercury"/"lib"/GradeDir,
165 + GradeLibDir = Prefix/"@libdir@"/"mercury"/"lib"/GradeDir,
166 % Our "Erlang archives" are actually directories.
167 install_directory(Globals, ErlangArchiveFileName, GradeLibDir,
168 LibsSucceeded, !IO),
169 install_grade_init(Globals, GradeDir, ModuleName, InitSucceeded,
170 !IO)
171 ;
172 - GradeLibDir = Prefix/"lib"/"mercury"/"lib"/GradeDir,
173 + GradeLibDir = Prefix/"@libdir@"/"mercury"/"lib"/GradeDir,
174 maybe_install_library_file(Globals, "static", LibFileName,
175 GradeLibDir, LibSuccess, !IO),
176 ( LibFileName = SharedLibFileName ->
177 @@ -1615,7 +1615,7 @@
178
179 install_grade_init(Globals, GradeDir, ModuleName, Succeeded, !IO) :-
180 globals.lookup_string_option(Globals, install_prefix, Prefix),
181 - GradeModulesDir = Prefix / "lib" / "mercury" / "modules" / GradeDir,
182 + GradeModulesDir = Prefix / "@libdir@" / "mercury" / "modules" / GradeDir,
183 module_name_to_file_name(Globals, ModuleName, ".init", do_not_create_dirs,
184 InitFileName, !IO),
185 install_file(Globals, InitFileName, GradeModulesDir, Succeeded, !IO).
186 @@ -1632,7 +1632,7 @@
187 (
188 MaybeImports = yes(Imports),
189 globals.lookup_string_option(Globals, install_prefix, Prefix),
190 - LibDir = Prefix/"lib"/"mercury",
191 + LibDir = Prefix/"@libdir@"/"mercury",
192
193 globals.get_target(Globals, Target),
194 globals.lookup_bool_option(Globals, highlevel_code, HighLevelCode),
195 @@ -1784,7 +1784,7 @@
196
197 make_install_dirs(Globals, Result, LinkResult, !IO) :-
198 globals.lookup_string_option(Globals, install_prefix, Prefix),
199 - LibDir = Prefix/"lib"/"mercury",
200 + LibDir = Prefix/"@libdir@"/"mercury",
201 make_directory(LibDir/"inc", Result1, !IO),
202 make_directory(LibDir/"modules", Result2, !IO),
203
204 @@ -1815,7 +1815,7 @@
205
206 make_grade_install_dirs(Globals, Grade, Result, LinkResult, !IO) :-
207 globals.lookup_string_option(Globals, install_prefix, Prefix),
208 - LibDir = Prefix/"lib"/"mercury",
209 + LibDir = Prefix/"@libdir@"/"mercury",
210
211 GradeIntsSubdir = LibDir/"ints"/Grade/"Mercury",
212 make_directory(GradeIntsSubdir, Result1, !IO),
213 diff -ur mercury-compiler-10.04.1.orig/library/Mmakefile mercury-compiler-10.04.1/library/Mmakefile
214 --- mercury-compiler-10.04.1.orig/library/Mmakefile 2010-09-05 11:44:16.000000000 +1200
215 +++ mercury-compiler-10.04.1/library/Mmakefile 2010-09-05 09:02:39.000000000 +1200
216 @@ -268,8 +268,8 @@
217 [ -d jmercury/runtime ] || cp -r ../java/runtime jmercury
218
219 install_mer_rt: $(RT_LIB_NAME).jar
220 - mkdir -p $(INSTALL_PREFIX)/lib/mercury/lib/$(GRADE)
221 - cp $(RT_LIB_NAME).jar $(INSTALL_PREFIX)/lib/mercury/lib/$(GRADE)
222 + mkdir -p $(INSTALL_LIBDIR)/lib/$(GRADE)
223 + cp $(RT_LIB_NAME).jar $(INSTALL_LIBDIR)/lib/$(GRADE)
224
225 else
226
227 diff -ur mercury-compiler-10.04.1.orig/scripts/Mmake.vars.in mercury-compiler-10.04.1/scripts/Mmake.vars.in
228 --- mercury-compiler-10.04.1.orig/scripts/Mmake.vars.in 2010-05-20 21:29:31.000000000 +1200
229 +++ mercury-compiler-10.04.1/scripts/Mmake.vars.in 2010-09-05 08:59:58.000000000 +1200
230 @@ -688,17 +688,17 @@
231 INSTALL_PREFIX = @prefix@
232 FINAL_INSTALL_PREFIX = @prefix@
233 INSTALL_BINDIR = $(INSTALL_PREFIX)/bin
234 -INSTALL_LIBDIR = $(INSTALL_PREFIX)/lib/mercury
235 -FINAL_INSTALL_LIBDIR = $(FINAL_INSTALL_PREFIX)/lib/mercury
236 +INSTALL_LIBDIR = $(INSTALL_PREFIX)/@libdir@/mercury
237 +FINAL_INSTALL_LIBDIR = $(FINAL_INSTALL_PREFIX)/@libdir@/mercury
238 INSTALL_INFO_DIR = $(INSTALL_PREFIX)/info
239 -INSTALL_DVI_DIR = $(INSTALL_PREFIX)/lib/mercury/doc
240 -INSTALL_TEXT_DIR = $(INSTALL_PREFIX)/lib/mercury/doc
241 -INSTALL_PS_DIR = $(INSTALL_PREFIX)/lib/mercury/doc
242 -INSTALL_PDF_DIR = $(INSTALL_PREFIX)/lib/mercury/doc
243 +INSTALL_DVI_DIR = $(INSTALL_PREFIX)/@libdir@/mercury/doc
244 +INSTALL_TEXT_DIR = $(INSTALL_PREFIX)/@libdir@/mercury/doc
245 +INSTALL_PS_DIR = $(INSTALL_PREFIX)/@libdir@/mercury/doc
246 +INSTALL_PDF_DIR = $(INSTALL_PREFIX)/@libdir@/mercury/doc
247 INSTALL_MAN_DIR = $(INSTALL_PREFIX)/man
248 -INSTALL_HTML_DIR = $(INSTALL_PREFIX)/lib/mercury/html
249 -INSTALL_MDB_DOC_DIR = $(INSTALL_PREFIX)/lib/mercury/mdb
250 -INSTALL_ELISP_DIR = $(INSTALL_PREFIX)/lib/mercury/elisp
251 +INSTALL_HTML_DIR = $(INSTALL_PREFIX)/@libdir@/mercury/html
252 +INSTALL_MDB_DOC_DIR = $(INSTALL_PREFIX)/@libdir@/mercury/mdb
253 +INSTALL_ELISP_DIR = $(INSTALL_PREFIX)/@libdir@/mercury/elisp
254 INSTALL_CGI_DIR = @CGIDIR@
255
256 # You should not need to override anything below here
257
258
259
260 1.1 dev-lang/mercury/files/mercury-10.04.1-sparc-llds-base-grade.patch
261
262 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-sparc-llds-base-grade.patch?rev=1.1&view=markup
263 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-sparc-llds-base-grade.patch?rev=1.1&content-type=text/plain
264
265 Index: mercury-10.04.1-sparc-llds-base-grade.patch
266 ===================================================================
267 diff -ur mercury-compiler-10.04.1.orig/configure mercury-compiler-10.04.1/configure
268 --- mercury-compiler-10.04.1.orig/configure 2010-08-29 19:27:34.000000000 +1200
269 +++ mercury-compiler-10.04.1/configure 2010-09-05 09:11:36.000000000 +1200
270 @@ -10805,7 +10805,7 @@
271 # The asm_fast and reg grades also do not currently work on Linux/PPC.
272 #
273 case "$host" in
274 - i*86*apple*darwin*|x86_64*apple*darwin*|powerpc*-linux-gnu)
275 + i*86*apple*darwin*|x86_64*apple*darwin*|powerpc*-linux-gnu|sparc*-linux-gnu)
276 BEST_LLDS_BASE_GRADE=none
277 ;;
278 esac
279
280
281
282 1.1 dev-lang/mercury/files/mercury-10.04.1-tests-static-link.patch
283
284 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-tests-static-link.patch?rev=1.1&view=markup
285 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-tests-static-link.patch?rev=1.1&content-type=text/plain
286
287 Index: mercury-10.04.1-tests-static-link.patch
288 ===================================================================
289 --- mercury-tests-10.04.1.orig/hard_coded/Mmakefile 2010-05-03 22:27:02.000000000 +1200
290 +++ mercury-tests-10.04.1/hard_coded/Mmakefile 2010-07-28 20:17:50.000000000 +1200
291 @@ -677,7 +677,7 @@
292 PROGS = $(ORDINARY_PROGS) $(PROF_PROGS) $(BROKEN_FOR_LCC_PROGS) \
293 $(CLOSURE_LAYOUT_PROGS) $(NON_PROFDEEP_PROGS) \
294 $(BACKEND_PROGS) $(NONDET_C_PROGS) \
295 - $(C_AND_GC_ONLY_PROGS) $(STATIC_LINK_PROGS) \
296 + $(C_AND_GC_ONLY_PROGS) \
297 $(CHAR_REP_PROGS) $(C_ONLY_PROGS) \
298 $(DOTNET_PROGS) $(JAVA_PROGS) $(SOLVER_PROGS) \
299 $(TRAILED_PROGS) $(MUTABLE_PROGS) $(TRACE_GOAL_ENV_PROGS) \
300
301
302
303 1.1 dev-lang/mercury/files/mercury-10.04.1-tests-sandbox.patch
304
305 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-tests-sandbox.patch?rev=1.1&view=markup
306 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-tests-sandbox.patch?rev=1.1&content-type=text/plain
307
308 Index: mercury-10.04.1-tests-sandbox.patch
309 ===================================================================
310 diff -ur mercury-tests-10.04.1.orig/hard_coded/dir_test.exp mercury-tests-10.04.1/hard_coded/dir_test.exp
311 --- mercury-tests-10.04.1.orig/hard_coded/dir_test.exp 2007-09-21 15:21:35.000000000 +1200
312 +++ mercury-tests-10.04.1/hard_coded/dir_test.exp 2010-09-05 09:40:36.000000000 +1200
313 @@ -130,7 +130,6 @@
314 "foo"/"bar/baz" = "foo\bar\baz".
315 "foo/"/"bar/baz" = "foo\bar\baz".
316 checking whether `unwritable' is readable...ok
317 -unwritable file found to be unwritable
318 current_directory succeeded: hard_coded
319 make_directory succeeded
320 make_directory succeeded
321 diff -ur mercury-tests-10.04.1.orig/hard_coded/dir_test.exp2 mercury-tests-10.04.1/hard_coded/dir_test.exp2
322 --- mercury-tests-10.04.1.orig/hard_coded/dir_test.exp2 2007-10-01 18:40:43.000000000 +1300
323 +++ mercury-tests-10.04.1/hard_coded/dir_test.exp2 2010-09-05 09:40:36.000000000 +1200
324 @@ -127,7 +127,6 @@
325 "foo"/"bar/baz" = "foo/bar/baz".
326 "foo/"/"bar/baz" = "foo/bar/baz".
327 checking whether `unwritable' is readable...ok
328 -unwritable file found to be unwritable
329 current_directory succeeded: hard_coded
330 make_directory succeeded
331 make_directory succeeded
332 diff -ur mercury-tests-10.04.1.orig/hard_coded/dir_test.exp3 mercury-tests-10.04.1/hard_coded/dir_test.exp3
333 --- mercury-tests-10.04.1.orig/hard_coded/dir_test.exp3 2007-10-01 18:40:43.000000000 +1300
334 +++ mercury-tests-10.04.1/hard_coded/dir_test.exp3 2010-09-05 09:40:36.000000000 +1200
335 @@ -130,7 +130,6 @@
336 "foo"/"bar/baz" = "foo/bar/baz".
337 "foo/"/"bar/baz" = "foo/bar/baz".
338 checking whether `unwritable' is readable...ok
339 -unwritable file found to be unwritable
340 current_directory succeeded: hard_coded
341 make_directory succeeded
342 make_directory succeeded
343 diff -ur mercury-tests-10.04.1.orig/hard_coded/dir_test.exp4 mercury-tests-10.04.1/hard_coded/dir_test.exp4
344 --- mercury-tests-10.04.1.orig/hard_coded/dir_test.exp4 2010-03-04 13:39:48.000000000 +1300
345 +++ mercury-tests-10.04.1/hard_coded/dir_test.exp4 2010-09-05 09:40:36.000000000 +1200
346 @@ -127,7 +127,6 @@
347 "foo"/"bar/baz" = "foo/bar/baz".
348 "foo/"/"bar/baz" = "foo/bar/baz".
349 checking whether `unwritable' is readable...ok
350 -unwritable file found to be unwritable
351 current_directory succeeded: hard_coded
352 make_directory succeeded
353 make_directory succeeded
354 diff -ur mercury-tests-10.04.1.orig/hard_coded/dir_test.m mercury-tests-10.04.1/hard_coded/dir_test.m
355 --- mercury-tests-10.04.1.orig/hard_coded/dir_test.m 2010-02-09 16:39:39.000000000 +1300
356 +++ mercury-tests-10.04.1/hard_coded/dir_test.m 2010-09-05 09:40:36.000000000 +1200
357 @@ -50,16 +50,6 @@
358 io__write(ReadResult),
359 io__nl,
360
361 - io__check_file_accessibility("unwritable",
362 - [read, write], WriteResult),
363 - ( { WriteResult = ok } ->
364 - io__write_string(
365 - "Error: unwritable file found to be writable\n")
366 - ;
367 - io__write_string(
368 - "unwritable file found to be unwritable\n")
369 - ),
370 -
371 % Execute permissions are not handled correctly on all platforms so
372 % just check that it doesn't crash.
373 io__check_file_accessibility("unwritable",
374
375
376
377 1.1 dev-lang/mercury/files/mercury-10.04.1-default-grade.patch
378
379 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-default-grade.patch?rev=1.1&view=markup
380 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-default-grade.patch?rev=1.1&content-type=text/plain
381
382 Index: mercury-10.04.1-default-grade.patch
383 ===================================================================
384 diff -ur mercury-compiler-10.04.1.orig/Makefile mercury-compiler-10.04.1/Makefile
385 --- mercury-compiler-10.04.1.orig/Makefile 2010-07-12 04:31:01.000000000 +1200
386 +++ mercury-compiler-10.04.1/Makefile 2010-09-05 09:02:03.000000000 +1200
387 @@ -69,6 +69,6 @@
388 $(MMAKE) uninstall
389
390 .DEFAULT:
391 - $(MMAKE) $@
392 + $(MMAKE) MMAKEFLAGS=$(PARALLEL) $@
393
394 #-----------------------------------------------------------------------------#
395 diff -ur mercury-compiler-10.04.1.orig/Mmakefile mercury-compiler-10.04.1/Mmakefile
396 --- mercury-compiler-10.04.1.orig/Mmakefile 2009-10-20 17:07:24.000000000 +1300
397 +++ mercury-compiler-10.04.1/Mmakefile 2010-09-05 09:02:03.000000000 +1200
398 @@ -286,6 +286,47 @@
399 mdbcomp browser ssdb trace
400 +cd deep_profiler && $(SUBDIR_MMAKE)
401
402 +.PHONY: default_grade
403 +default_grade:
404 + +if test "$(DEFAULT_GRADE)" != "$(GRADE)"; then \
405 + gc_grade=`scripts/ml --grade $(DEFAULT_GRADE) --print-gc-grade`; \
406 + IWS=`/bin/pwd`/install_grade_dir.$(DEFAULT_GRADE); \
407 + ( \
408 + scripts/prepare_install_dir $${IWS} && \
409 + ( cd $${IWS}/boehm_gc && \
410 + $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS} \
411 + GC_GRADE=$${gc_grade} libgrade ) && \
412 + ( cd $${IWS}/runtime && \
413 + $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS} \
414 + libgrade ) && \
415 + ( cd $${IWS}/library && \
416 + $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS} \
417 + depend && \
418 + $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS} \
419 + libgrade ) && \
420 + ( cd $${IWS}/mdbcomp && \
421 + $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS} \
422 + depend && \
423 + $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS} \
424 + libgrade ) && \
425 + ( cd $${IWS}/browser && \
426 + $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS} \
427 + depend && \
428 + $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS} \
429 + libgrade ) && \
430 + ( cd $${IWS}/ssdb && \
431 + $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS} \
432 + depend && \
433 + $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS} \
434 + libgrade ) && \
435 + ( cd $${IWS}/trace && \
436 + $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS} \
437 + libgrade ) && \
438 + true \
439 + ) || \
440 + { exit 1; }; \
441 + fi;
442 +
443 #-----------------------------------------------------------------------------#
444
445 .PHONY: tags
446 diff -ur mercury-compiler-10.04.1.orig/boehm_gc/Mmakefile mercury-compiler-10.04.1/boehm_gc/Mmakefile
447 --- mercury-compiler-10.04.1.orig/boehm_gc/Mmakefile 2010-02-27 02:16:44.000000000 +1300
448 +++ mercury-compiler-10.04.1/boehm_gc/Mmakefile 2010-09-05 09:02:03.000000000 +1200
449 @@ -176,6 +176,9 @@
450
451 # No need to install the Boehm collector for grades which don't use it.
452
453 +.PHONY: libgrade
454 +libgrade:
455 +
456 .PHONY: install_headers
457 install_headers:
458
459 @@ -187,6 +190,9 @@
460
461 else
462
463 +.PHONY: libgrade
464 +libgrade: lib$(GC_GRADE).$A lib$(GC_GRADE).$(EXT_FOR_SHARED_LIB)
465 +
466 .PHONY: install_headers
467 install_headers: install_dirs
468 cp $(HEADERS) $(INSTALL_INC_DIR)
469 diff -ur mercury-compiler-10.04.1.orig/browser/Mmakefile mercury-compiler-10.04.1/browser/Mmakefile
470 --- mercury-compiler-10.04.1.orig/browser/Mmakefile 2010-05-10 18:31:55.000000000 +1200
471 +++ mercury-compiler-10.04.1/browser/Mmakefile 2010-09-05 09:02:03.000000000 +1200
472 @@ -256,16 +256,28 @@
473
474 # there is no browser in the .NET or Erlang backends
475
476 +.PHONY: libgrade
477 +libgrade:
478 +
479 .PHONY: install_library
480 install_library:
481
482 else ifneq (,$(findstring java,$(GRADE)))
483
484 +.PHONY: libgrade
485 +libgrade:
486 +
487 .PHONY: install_library
488 install_library: lib$(BROWSER_LIB_NAME).install
489
490 else
491
492 +.PHONY: libgrade
493 +libgrade: \
494 + lib$(BROWSER_LIB_NAME).$A \
495 + lib$(BROWSER_LIB_NAME).$(EXT_FOR_SHARED_LIB) \
496 + all-ints
497 +
498 .PHONY: install_library
499 install_library: \
500 lib$(BROWSER_LIB_NAME).install_library \
501 diff -ur mercury-compiler-10.04.1.orig/library/Mmakefile mercury-compiler-10.04.1/library/Mmakefile
502 --- mercury-compiler-10.04.1.orig/library/Mmakefile 2010-05-20 21:29:30.000000000 +1200
503 +++ mercury-compiler-10.04.1/library/Mmakefile 2010-09-05 09:02:03.000000000 +1200
504 @@ -493,6 +493,9 @@
505
506 # XXX some modules in the browser directory need library.int3
507
508 +.PHONY: libgrade
509 +libgrade: mercury.dll
510 +
511 .PHONY: install_library
512 install_library: mercury.dll install_grade_dirs install_gac \
513 install_strong_name lib$(STD_LIB_NAME).install_grade_hdrs \
514 @@ -531,6 +534,9 @@
515
516 else
517
518 +.PHONY: libgrade
519 +libgrade: lib$(STD_LIB_NAME)
520 +
521 # we depend on lib$(STD_LIB_NAME) because lib$(STD_LIB_NAME).install_library
522 # doesn't make library.int3, but some modules in the browser directory need it.
523
524 @@ -541,6 +547,9 @@
525
526 else #ifneq ($(MMAKE_USE_MMC_MAKE),yes)
527
528 +.PHONY: libgrade
529 +libgrade: lib$(STD_LIB_NAME) all-ints
530 +
531 .PHONY: install_mercury
532 install_mercury: install_library
533
534 diff -ur mercury-compiler-10.04.1.orig/mdbcomp/Mmakefile mercury-compiler-10.04.1/mdbcomp/Mmakefile
535 --- mercury-compiler-10.04.1.orig/mdbcomp/Mmakefile 2010-05-10 18:32:00.000000000 +1200
536 +++ mercury-compiler-10.04.1/mdbcomp/Mmakefile 2010-09-05 09:02:03.000000000 +1200
537 @@ -215,16 +215,28 @@
538
539 # there is no debugger in the .NET or Erlang backends
540
541 +.PHONY: libgrade
542 +libgrade:
543 +
544 .PHONY: install_library
545 install_library:
546
547 else ifneq (,$(findstring java,$(GRADE)))
548
549 +.PHONY: libgrade
550 +libgrade:
551 +
552 .PHONY: install_library
553 install_library: lib$(MDBCOMP_LIB_NAME).install
554
555 else
556
557 +.PHONY: libgrade
558 +libgrade: \
559 + lib$(MDBCOMP_LIB_NAME).$A \
560 + lib$(MDBCOMP_LIB_NAME).$(EXT_FOR_SHARED_LIB) \
561 + all-ints
562 +
563 .PHONY: install_library
564 install_library: \
565 lib$(MDBCOMP_LIB_NAME).install_library \
566 diff -ur mercury-compiler-10.04.1.orig/runtime/Mmakefile mercury-compiler-10.04.1/runtime/Mmakefile
567 --- mercury-compiler-10.04.1.orig/runtime/Mmakefile 2010-07-16 03:24:52.000000000 +1200
568 +++ mercury-compiler-10.04.1/runtime/Mmakefile 2010-09-05 09:02:03.000000000 +1200
569 @@ -466,6 +466,9 @@
570 # mercury/library/Mmakefile.)
571 # (Runtime support for the Erlang backend is in the library directory.)
572
573 +.PHONY: libgrade
574 +libgrade:
575 +
576 .PHONY: install_headers
577 install_headers:
578
579 @@ -478,6 +481,9 @@
580 else
581 ifeq ($(findstring il,$(GRADE)),il)
582
583 +.PHONY: libgrade
584 +libgrade: $(DOTNET_DLLS)
585 +
586 .PHONY: install_headers
587 install_headers:
588
589 @@ -492,6 +498,9 @@
590
591 else
592
593 +.PHONY: libgrade
594 +libgrade: lib$(RT_LIB_NAME).$A lib$(RT_LIB_NAME).$(EXT_FOR_SHARED_LIB)
595 +
596 # mercury_conf.h needs to be in a separate directory so it can be
597 # overridden by a different configuration.
598 .PHONY: install_headers
599 diff -ur mercury-compiler-10.04.1.orig/ssdb/Mmakefile mercury-compiler-10.04.1/ssdb/Mmakefile
600 --- mercury-compiler-10.04.1.orig/ssdb/Mmakefile 2010-05-10 18:32:00.000000000 +1200
601 +++ mercury-compiler-10.04.1/ssdb/Mmakefile 2010-09-05 09:02:03.000000000 +1200
602 @@ -250,16 +250,28 @@
603
604 # there is no ssdb in the .NET or Erlang backends
605
606 +.PHONY: libgrade
607 +libgrade:
608 +
609 .PHONY: install_library
610 install_library:
611
612 else ifneq (,$(findstring java,$(GRADE)))
613
614 +.PHONY: libgrade
615 +libgrade:
616 +
617 .PHONY: install_library
618 install_library: lib$(SSDB_LIB_NAME).install
619
620 else
621
622 +.PHONY: libgrade
623 +libgrade: \
624 + lib$(SSDB_LIB_NAME).$A \
625 + lib$(SSDB_LIB_NAME).$(EXT_FOR_SHARED_LIB) \
626 + all-ints
627 +
628 .PHONY: install_library
629 install_library: \
630 lib$(SSDB_LIB_NAME).install_library \
631 diff -ur mercury-compiler-10.04.1.orig/trace/Mmakefile mercury-compiler-10.04.1/trace/Mmakefile
632 --- mercury-compiler-10.04.1.orig/trace/Mmakefile 2008-07-30 05:58:58.000000000 +1200
633 +++ mercury-compiler-10.04.1/trace/Mmakefile 2010-09-05 09:02:03.000000000 +1200
634 @@ -324,6 +324,9 @@
635
636 # there is no tracing in the .NET, Java, Erlang backends
637
638 +.PHONY: libgrade
639 +libgrade:
640 +
641 .PHONY: install_headers
642 install_headers:
643
644 @@ -332,6 +335,13 @@
645
646 else
647
648 +.PHONY: libgrade
649 +libgrade: \
650 + lib$(TRACE_LIB_NAME).$A \
651 + lib$(TRACE_LIB_NAME).$(EXT_FOR_SHARED_LIB) \
652 + lib$(EVENTSPEC_LIB_NAME).$A \
653 + lib$(EVENTSPEC_LIB_NAME).$(EXT_FOR_SHARED_LIB)
654 +
655 .PHONY: install_headers
656 install_headers: $(HDRS) $(LIB_GLOBALS_H)
657 cp `vpath_find $(HDRS) $(LIB_GLOBALS_H)` $(INSTALL_INC_DIR)
658
659
660
661 1.1 dev-lang/mercury/files/mercury-10.04.1-docs.patch
662
663 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-docs.patch?rev=1.1&view=markup
664 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-docs.patch?rev=1.1&content-type=text/plain
665
666 Index: mercury-10.04.1-docs.patch
667 ===================================================================
668 diff -ur mercury-compiler-10.04.1.orig/doc/Mmakefile mercury-compiler-10.04.1/doc/Mmakefile
669 --- mercury-compiler-10.04.1.orig/doc/Mmakefile 2010-07-07 01:42:07.000000000 +1200
670 +++ mercury-compiler-10.04.1/doc/Mmakefile 2010-09-05 09:13:40.000000000 +1200
671 @@ -120,7 +120,7 @@
672 # formatted versions of the man pages.
673 # But it might make sense to add them.
674 .PHONY: all
675 -all: $(INFOPAGES) $(DVI) $(HTML) manpages $(MDB_DOC)
676 +all: $(INFOPAGES) $(HTML) manpages $(MDB_DOC)
677 #all: ps pdf text formatted_manpages
678
679 #-----------------------------------------------------------------------------#
680 @@ -351,7 +351,7 @@
681 # versions of the documentation. If they are added they should
682 # be installed here.
683 .PHONY: install
684 -install: install_info install_html install_dvi install_manpages \
685 +install: install_info install_html install_manpages \
686 install_mdb_doc
687 # install_text install_ps
688
689
690
691
692 1.1 dev-lang/mercury/files/mercury-10.04.1-no-reconf.patch
693
694 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-no-reconf.patch?rev=1.1&view=markup
695 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-no-reconf.patch?rev=1.1&content-type=text/plain
696
697 Index: mercury-10.04.1-no-reconf.patch
698 ===================================================================
699 diff -ur mercury-compiler-10.04.1.orig/runtime/Mmakefile mercury-compiler-10.04.1/runtime/Mmakefile
700 --- mercury-compiler-10.04.1.orig/runtime/Mmakefile 2010-07-16 03:24:52.000000000 +1200
701 +++ mercury-compiler-10.04.1/runtime/Mmakefile 2010-09-05 09:15:31.000000000 +1200
702 @@ -455,8 +455,6 @@
703 mkdir -p $(INSTALL_GRADE_MODULE_DIR)
704 -[ -d $(INSTALL_MERC_LIB_DIR) ] || mkdir -p $(INSTALL_MERC_LIB_DIR)
705 -[ -d $(INSTALL_CONF_DIR) ] || mkdir -p $(INSTALL_CONF_DIR)
706 - -[ -d $(INSTALL_RECONF_DIR)/runtime ] || \
707 - mkdir -p $(INSTALL_RECONF_DIR)/runtime
708
709 ifneq "$(filter java% erlang%,$(GRADE))" ""
710
711 @@ -502,7 +500,6 @@
712 rm -f $(INSTALL_INC_DIR)/mercury_conf.h
713 cp `vpath_find mercury_conf.h` $(INSTALL_CONF_DIR)
714 -chmod u+w $(INSTALL_CONF_DIR)/mercury_conf.h
715 - cp `vpath_find mercury_conf.h.in` $(INSTALL_RECONF_DIR)/runtime
716 cp `vpath_find $(MACHHDRS)` $(INSTALL_INC_DIR)/machdeps
717
718 .PHONY: install_init
719 diff -ur mercury-compiler-10.04.1.orig/scripts/Mmakefile mercury-compiler-10.04.1/scripts/Mmakefile
720 --- mercury-compiler-10.04.1.orig/scripts/Mmakefile 2009-09-02 11:54:38.000000000 +1200
721 +++ mercury-compiler-10.04.1/scripts/Mmakefile 2010-09-05 09:15:31.000000000 +1200
722 @@ -24,17 +24,13 @@
723 canonical_grade \
724 mdb \
725 mdprof \
726 - mercury.bat \
727 - mercury_config \
728 mercury_update_interface \
729 mgnuc \
730 - mkfifo_using_mknod \
731 ml \
732 mmake \
733 mmc \
734 mprof \
735 - mtags \
736 - prepare_install_dir
737 + mtags
738
739 SCRIPTS = $(NONCONF_SCRIPTS) $(CONF_SCRIPTS)
740
741 @@ -113,8 +109,6 @@
742 [ -d $(INSTALL_LIBDIR)/mdb ] || mkdir -p $(INSTALL_LIBDIR)/mdb
743 [ -d $(INSTALL_CONF_DIR) ] || mkdir -p $(INSTALL_CONF_DIR)
744 [ -d $(INSTALL_ELISP_DIR) ] || mkdir -p $(INSTALL_ELISP_DIR)
745 - [ -d $(INSTALL_RECONF_DIR)/scripts ] || \
746 - mkdir -p $(INSTALL_RECONF_DIR)/scripts
747
748 .PHONY: install_mmake
749 install_mmake: Mmake.vars Mmake.rules install_dirs
750 @@ -132,7 +126,6 @@
751 -for file in $(SCRIPTS); do \
752 chmod u+w $(INSTALL_BINDIR)/$$file ;\
753 done
754 - cp *.in *.sh-subr $(SCRIPTS) $(INSTALL_RECONF_DIR)/scripts
755 -rm -f $(INSTALL_BINDIR)/mmake.old
756
757 .PHONY: install_config
758
759
760
761 1.1 dev-lang/mercury/files/mercury-10.04.1-boehm_gc.patch
762
763 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-boehm_gc.patch?rev=1.1&view=markup
764 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-boehm_gc.patch?rev=1.1&content-type=text/plain
765
766 Index: mercury-10.04.1-boehm_gc.patch
767 ===================================================================
768 diff -urN mercury-compiler-10.04.1.orig/boehm_gc/Makefile.direct mercury-compiler-10.04.1/boehm_gc/Makefile.direct
769 --- mercury-compiler-10.04.1.orig/boehm_gc/Makefile.direct 2010-02-24 20:04:32.000000000 +1300
770 +++ mercury-compiler-10.04.1/boehm_gc/Makefile.direct 2010-09-05 09:07:10.000000000 +1200
771 @@ -407,6 +407,7 @@
772 ./if_mach SPARC SOLARIS $(CC) -c -o mach_dep2.o $(srcdir)/sparc_mach_dep.S
773 ./if_mach SPARC OPENBSD $(AS) -o mach_dep2.o $(srcdir)/sparc_sunos4_mach_dep.s
774 ./if_mach SPARC NETBSD $(AS) -o mach_dep2.o $(srcdir)/sparc_netbsd_mach_dep.s
775 + ./if_mach SPARC LINUX $(CC) -c -o mach_dep2.o $(SPECIALCFLAGS) $(srcdir)/sparc_generic_mach_dep.c
776 ./if_mach SPARC "" $(CC) -c -o mach_dep1.o $(SPECIALCFLAGS) $(srcdir)/mach_dep.c
777 ./if_mach SPARC "" ld -r -o mach_dep.o mach_dep1.o mach_dep2.o
778 ./if_mach IA64 "" as $(AS_ABI_FLAG) -o ia64_save_regs_in_stack.o $(srcdir)/ia64_save_regs_in_stack.s
779 diff -urN mercury-compiler-10.04.1.orig/boehm_gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h mercury-compiler-10.04.1/boehm_gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h
780 --- mercury-compiler-10.04.1.orig/boehm_gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h 2010-02-23 19:28:41.000000000 +1300
781 +++ mercury-compiler-10.04.1/boehm_gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h 2010-09-05 09:07:10.000000000 +1200
782 @@ -39,32 +39,6 @@
783
784 #define AO_HAVE_test_and_set_full
785
786 -#ifndef AO_NO_SPARC_V9
787 -/* Returns nonzero if the comparison succeeded. */
788 -AO_INLINE int
789 -AO_compare_and_swap_full(volatile AO_t *addr, AO_t old, AO_t new_val) {
790 - char ret;
791 - __asm__ __volatile__ ("membar #StoreLoad | #LoadLoad\n\t"
792 -# if defined(__arch64__)
793 - "casx [%2],%0,%1\n\t"
794 -# else
795 - "cas [%2],%0,%1\n\t" /* 32-bit version */
796 -# endif
797 - "membar #StoreLoad | #StoreStore\n\t"
798 - "cmp %0,%1\n\t"
799 - "be,a 0f\n\t"
800 - "mov 1,%0\n\t"/* one insn after branch always executed */
801 - "clr %0\n\t"
802 - "0:\n\t"
803 - : "=r" (ret), "+r" (new_val)
804 - : "r" (addr), "0" (old)
805 - : "memory", "cc");
806 - return (int)ret;
807 -}
808 -
809 -#define AO_HAVE_compare_and_swap_full
810 -#endif /* AO_NO_SPARC_V9 */
811 -
812 /* FIXME: This needs to be extended for SPARC v8 and v9. */
813 /* SPARC V8 also has swap. V9 has CAS. */
814 /* There are barriers like membar #LoadStore. */
815 diff -urN mercury-compiler-10.04.1.orig/boehm_gc/sparc_generic_mach_dep.c mercury-compiler-10.04.1/boehm_gc/sparc_generic_mach_dep.c
816 --- mercury-compiler-10.04.1.orig/boehm_gc/sparc_generic_mach_dep.c 1970-01-01 12:00:00.000000000 +1200
817 +++ mercury-compiler-10.04.1/boehm_gc/sparc_generic_mach_dep.c 2010-09-05 09:07:10.000000000 +1200
818 @@ -0,0 +1,82 @@
819 +# include "private/gc_priv.h"
820 +
821 +/* On register window machines, we need a way to force registers into */
822 +/* the stack. Return sp. */
823 +# ifdef SPARC
824 + asm(" .seg \"text\"");
825 +# if defined(SVR4) || defined(NETBSD) || defined(FREEBSD)
826 + asm(" .globl GC_save_regs_in_stack");
827 + asm("GC_save_regs_in_stack:");
828 + asm(" .type GC_save_regs_in_stack,#function");
829 +# else
830 + asm(" .globl _GC_save_regs_in_stack");
831 + asm("_GC_save_regs_in_stack:");
832 +# endif
833 +# if defined(__arch64__) || defined(__sparcv9)
834 + asm(" save %sp,-128,%sp");
835 + asm(" flushw");
836 + asm(" ret");
837 + asm(" restore %sp,2047+128,%o0");
838 +# else
839 + asm(" ta 0x3 ! ST_FLUSH_WINDOWS");
840 + asm(" retl");
841 + asm(" mov %sp,%o0");
842 +# endif
843 +# ifdef SVR4
844 + asm(" .GC_save_regs_in_stack_end:");
845 + asm(" .size GC_save_regs_in_stack,.GC_save_regs_in_stack_end-GC_save_regs_in_stack");
846 +# endif
847 +# ifdef LINT
848 + word GC_save_regs_in_stack() { return(0 /* sp really */);}
849 +# endif
850 +# endif
851 +
852 +/* GC_clear_stack_inner(arg, limit) clears stack area up to limit and */
853 +/* returns arg. Stack clearing is crucial on SPARC, so we supply */
854 +/* an assembly version that's more careful. Assumes limit is hotter */
855 +/* than sp, and limit is 8 byte aligned. */
856 +#if defined(ASM_CLEAR_CODE)
857 +# ifdef SUNOS4
858 + asm(".globl _GC_clear_stack_inner");
859 + asm("_GC_clear_stack_inner:");
860 +# else
861 + asm(".globl GC_clear_stack_inner");
862 + asm("GC_clear_stack_inner:");
863 + asm(".type GC_save_regs_in_stack,#function");
864 +# endif
865 +#if defined(__arch64__) || defined(__sparcv9)
866 + asm("mov %sp,%o2"); /* Save sp */
867 + asm("add %sp,2047-8,%o3"); /* p = sp+bias-8 */
868 + asm("add %o1,-2047-192,%sp"); /* Move sp out of the way, */
869 + /* so that traps still work. */
870 + /* Includes some extra words */
871 + /* so we can be sloppy below. */
872 + asm("loop:");
873 + asm("stx %g0,[%o3]"); /* *(long *)p = 0 */
874 + asm("cmp %o3,%o1");
875 + asm("bgu,pt %xcc, loop"); /* if (p > limit) goto loop */
876 + asm("add %o3,-8,%o3"); /* p -= 8 (delay slot) */
877 + asm("retl");
878 + asm("mov %o2,%sp"); /* Restore sp., delay slot */
879 +#else
880 + asm("mov %sp,%o2"); /* Save sp */
881 + asm("add %sp,-8,%o3"); /* p = sp-8 */
882 + asm("clr %g1"); /* [g0,g1] = 0 */
883 + asm("add %o1,-0x60,%sp"); /* Move sp out of the way, */
884 + /* so that traps still work. */
885 + /* Includes some extra words */
886 + /* so we can be sloppy below. */
887 + asm("loop:");
888 + asm("std %g0,[%o3]"); /* *(long long *)p = 0 */
889 + asm("cmp %o3,%o1");
890 + asm("bgu loop "); /* if (p > limit) goto loop */
891 + asm("add %o3,-8,%o3"); /* p -= 8 (delay slot) */
892 + asm("retl");
893 + asm("mov %o2,%sp"); /* Restore sp., delay slot */
894 +#endif /* old SPARC */
895 + /* First argument = %o0 = return value */
896 +# ifdef SVR4
897 + asm(" .GC_clear_stack_inner_end:");
898 + asm(" .size GC_clear_stack_inner,.GC_clear_stack_inner_end-GC_clear_stack_inner");
899 +# endif
900 +#endif
901
902
903
904 1.1 dev-lang/mercury/files/mercury-10.04.1-linker-flags.patch
905
906 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-linker-flags.patch?rev=1.1&view=markup
907 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-linker-flags.patch?rev=1.1&content-type=text/plain
908
909 Index: mercury-10.04.1-linker-flags.patch
910 ===================================================================
911 diff -ur mercury-compiler-10.04.1.orig/boehm_gc/Makefile.direct mercury-compiler-10.04.1/boehm_gc/Makefile.direct
912 --- mercury-compiler-10.04.1.orig/boehm_gc/Makefile.direct 2010-02-24 20:04:32.000000000 +1300
913 +++ mercury-compiler-10.04.1/boehm_gc/Makefile.direct 2010-09-05 17:42:33.000000000 +1200
914 @@ -351,7 +351,7 @@
915 -ldl `./threadlibs`
916 ./if_not_there on_sparc_sunos5_so $(MAKE) dyn_load.o
917 ./if_not_there on_sparc_sunos5_so \
918 - $(LINK_SHARED_OBJ) -o lib$(GC_GRADE).so $(OBJS) dyn_load.o -lc
919 + $(LINK_SHARED_OBJ) -o lib$(GC_GRADE).so $(OBJS) dyn_load.o -lc $(EXTRA_LDFLAGS)
920
921 # Darwin shared library version of the gc.
922 lib$(GC_GRADE).dylib: $(OBJS) $(UTILS)
923 diff -ur mercury-compiler-10.04.1.orig/library/Mmakefile mercury-compiler-10.04.1/library/Mmakefile
924 --- mercury-compiler-10.04.1.orig/library/Mmakefile 2010-09-05 11:44:16.000000000 +1200
925 +++ mercury-compiler-10.04.1/library/Mmakefile 2010-05-20 21:29:30.000000000 +1200
926 @@ -268,8 +268,8 @@
927 [ -d jmercury/runtime ] || cp -r ../java/runtime jmercury
928
929 install_mer_rt: $(RT_LIB_NAME).jar
930 - mkdir -p $(INSTALL_LIBDIR)/lib/$(GRADE)
931 - cp $(RT_LIB_NAME).jar $(INSTALL_LIBDIR)/lib/$(GRADE)
932 + mkdir -p $(INSTALL_PREFIX)/lib/mercury/lib/$(GRADE)
933 + cp $(RT_LIB_NAME).jar $(INSTALL_PREFIX)/lib/mercury/lib/$(GRADE)
934
935 else
936
937 diff -ur mercury-compiler-10.04.1.orig/runtime/Mmakefile mercury-compiler-10.04.1/runtime/Mmakefile
938 --- mercury-compiler-10.04.1.orig/runtime/Mmakefile 2010-07-16 03:24:52.000000000 +1200
939 +++ mercury-compiler-10.04.1/runtime/Mmakefile 2010-09-05 17:42:33.000000000 +1200
940 @@ -387,7 +387,7 @@
941 $(LINK_SHARED_OBJ) $(ERROR_UNDEFINED) \
942 -o lib$(RT_LIB_NAME).so $(PIC_OBJS) \
943 $(SHLIB_RPATH_OPT)$(FINAL_INSTALL_MERC_GC_LIB_DIR) \
944 - $(LDFLAGS) $(LDLIBS) $(THREADLIBS) \
945 + $(ALL_LDFLAGS) $(LDLIBS) $(THREADLIBS) \
946 $(SHARED_LIBS)
947
948 # For Darwin we should pass the -install_name option.
949 diff -ur mercury-compiler-10.04.1.orig/trace/Mmakefile mercury-compiler-10.04.1/trace/Mmakefile
950 --- mercury-compiler-10.04.1.orig/trace/Mmakefile 2008-07-30 05:58:58.000000000 +1200
951 +++ mercury-compiler-10.04.1/trace/Mmakefile 2010-09-05 17:42:33.000000000 +1200
952 @@ -273,6 +273,7 @@
953 $(LINK_SHARED_OBJ) $(ERROR_UNDEFINED) \
954 -o lib$(TRACE_LIB_NAME).so $(TRACE_PIC_OBJS) \
955 $(RPATH_1)$(RPATH_2) \
956 + $(ALL_LDFLAGS) \
957 $(TRACE_LDFLAGS) $(TRACE_LDLIBS) $(THREADLIBS) \
958 $(SHARED_LIBS)
959
960 @@ -280,6 +281,7 @@
961 $(LINK_SHARED_OBJ) $(ERROR_UNDEFINED) \
962 -o lib$(EVENTSPEC_LIB_NAME).so $(EVENTSPEC_PIC_OBJS) \
963 $(RPATH_1)$(RPATH_2) \
964 + $(ALL_LDFLAGS) \
965 $(EVENTSPEC_LDFLAGS) $(EVENTSPEC_LDLIBS) $(THREADLIBS) \
966 $(SHARED_LIBS)
967
968 diff -ur mercury-compiler-10.04.1.orig/util/Mmakefile mercury-compiler-10.04.1/util/Mmakefile
969 --- mercury-compiler-10.04.1.orig/util/Mmakefile 2010-07-12 04:31:03.000000000 +1200
970 +++ mercury-compiler-10.04.1/util/Mmakefile 2010-09-05 17:42:33.000000000 +1200
971 @@ -41,16 +41,16 @@
972
973 .c:
974 $(MGNUC) --no-mercury-stdlib-dir \
975 - $(GRADEFLAGS) $(ALL_MGNUCFLAGS) -o $@ $< $(GETOPT_SRC)
976 + $(GRADEFLAGS) $(ALL_MGNUCFLAGS) $(ALL_LDFLAGS) -o $@ $< $(GETOPT_SRC)
977
978 mkinit: mkinit.c mkinit_common.c mkinit_common.h
979 $(MGNUC) --no-mercury-stdlib-dir \
980 - $(GRADEFLAGS) $(ALL_MGNUCFLAGS) -o $@ \
981 + $(GRADEFLAGS) $(ALL_MGNUCFLAGS) $(ALL_LDFLAGS) -o $@ \
982 mkinit.c mkinit_common.c $(GETOPT_SRC)
983
984 mkinit_erl: mkinit_erl.c mkinit_common.c mkinit_common.h
985 $(MGNUC) --no-mercury-stdlib-dir \
986 - $(GRADEFLAGS) $(ALL_MGNUCFLAGS) -o $@ \
987 + $(GRADEFLAGS) $(ALL_MGNUCFLAGS) $(ALL_LDFLAGS) -o $@ \
988 mkinit_erl.c mkinit_common.c $(GETOPT_SRC)
989
990 tags:
991
992
993
994 1.1 dev-lang/mercury/files/mercury-10.04.1-tests-workspace.patch
995
996 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-tests-workspace.patch?rev=1.1&view=markup
997 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-tests-workspace.patch?rev=1.1&content-type=text/plain
998
999 Index: mercury-10.04.1-tests-workspace.patch
1000 ===================================================================
1001 --- mercury-tests-10.04.1.orig/Mmake.common 2010-02-15 19:49:51.000000000 +1300
1002 +++ mercury-tests-10.04.1/Mmake.common 2010-09-05 09:34:38.000000000 +1200
1003 @@ -79,8 +79,8 @@
1004 -include $(TESTS_DIR)/Mmake.params
1005
1006 MCFLAGS += --flags $(TESTS_DIR)/TESTS_FLAGS
1007 -ifdef WORKSPACE_FLAGS
1008 -MCFLAGS += --flags $(TESTS_DIR)/WS_FLAGS
1009 +ifdef WORKSPACE
1010 +MCFLAGS += --flags $(TESTS_DIR)/WS_FLAGS.ws
1011 endif
1012
1013 # Avoid trying to make this file with `mmc --make' if it doesn't exist.
1014 --- mercury-compiler-10.04.1.orig/configure 2010-08-29 19:27:34.000000000 +1200
1015 +++ mercury-compiler-10.04.1/configure 2010-09-05 09:37:11.000000000 +1200
1016 @@ -14798,10 +14798,10 @@
1017 test_flags="tests/TESTS_FLAGS"
1018 test_mdbrc="tests/mdbrc"
1019 else
1020 - if test -e ../tests/TESTS_FLAGS.in
1021 + if test -e ../mercury-tests-10.04.1/TESTS_FLAGS.in
1022 then
1023 - test_flags="../tests/TESTS_FLAGS"
1024 - test_mdbrc="../tests/mdbrc"
1025 + test_flags="../mercury-tests-10.04.1/TESTS_FLAGS"
1026 + test_mdbrc="../mercury-tests-10.04.1/mdbrc"
1027 else
1028 test_flags=""
1029 test_mdbrc=""
Report Message
Find on MARC Find on Google Groups