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