1 |
keri 10/10/10 05:32:54 |
2 |
|
3 |
Added: mercury-extras-10.04.2-iodbc.patch |
4 |
mercury-extras-10.04.2-no-java-grade-no-erlang-grade.patch |
5 |
mercury-extras-10.04.2-mercury-tcltk.patch |
6 |
mercury-extras-10.04.2-odbc.patch |
7 |
mercury-extras-10.04.2-curs.patch |
8 |
mercury-extras-10.04.2-mercury-glut.patch |
9 |
mercury-extras-10.04.2-posix.patch |
10 |
mercury-extras-10.04.2-mercury-opengl.patch |
11 |
mercury-extras-10.04.2-lex.patch |
12 |
mercury-extras-10.04.2-dynamic-linking.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-extras/files/mercury-extras-10.04.2-iodbc.patch |
19 |
|
20 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.2-iodbc.patch?rev=1.1&view=markup |
21 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.2-iodbc.patch?rev=1.1&content-type=text/plain |
22 |
|
23 |
Index: mercury-extras-10.04.2-iodbc.patch |
24 |
=================================================================== |
25 |
diff -urN mercury-extras-10.04.2.orig/odbc/Mmakefile mercury-extras-10.04.1/odbc/Mmakefile |
26 |
--- mercury-extras-10.04.2.orig/odbc/Mmakefile 2006-04-03 18:19:54.000000000 +1200 |
27 |
+++ mercury-extras-10.04.2/odbc/Mmakefile 2010-09-06 19:44:01.000000000 +1200 |
28 |
@@ -12,7 +12,7 @@ |
29 |
# The driver manager. |
30 |
# Legal values for MODBC_DRIVER are MODBC_IODBC, MODBC_UNIX, and MODBC_MS. |
31 |
# Feel free to add more (and handle them in odbc.m). |
32 |
-MODBC_DRIVER=MODBC_UNIX |
33 |
+MODBC_DRIVER=MODBC_IODBC |
34 |
|
35 |
# The database. |
36 |
# Legal values for MODBC_DB are MODBC_MYSQL and MODBC_SQL_SERVER. |
37 |
@@ -41,17 +41,20 @@ |
38 |
# The following are for Debian. |
39 |
|
40 |
# for unixODBC |
41 |
- MLLIBS=-lodbc -lpthread -lltdl -ldl |
42 |
- |
43 |
+ MLLIBS=`iodbc-config --libs` |
44 |
+ ODBC_CFLAGS=`iodbc-config --cflags` |
45 |
# for iODBC |
46 |
# MLLIBS=-liodbc l-pthread -ldl |
47 |
# note: on a DEC Alpha using OSF1 remove the -ldl. |
48 |
endif |
49 |
|
50 |
-MAIN_TARGET=odbc_test |
51 |
+MAIN_TARGET=libodbc |
52 |
|
53 |
.PHONY: depend |
54 |
-depend: odbc_test.depend |
55 |
+depend: odbc.depend |
56 |
+ |
57 |
+.PHONY: install |
58 |
+install: libodbc.install |
59 |
|
60 |
.PHONY: check |
61 |
check: |
62 |
@@ -62,7 +65,7 @@ |
63 |
# `--no-ansi' is needed because the ODBC header files include C++-style |
64 |
# "//" comments. `--no-ansi' allows recognition of C++-style "//" comments, |
65 |
# presuming you have gcc version 2.7.1 or greater. |
66 |
-MGNUCFLAGS=--no-ansi -D$(MODBC_DRIVER) -D$(MODBC_DB) -I$(ODBC_INCL_DIR) |
67 |
+MGNUCFLAGS=--no-ansi -D$(MODBC_DRIVER) -D$(MODBC_DB) $(ODBC_CFLAGS) |
68 |
|
69 |
#-----------------------------------------------------------------------------# |
70 |
#-----------------------------------------------------------------------------# |
71 |
diff -urN mercury-extras-10.04.2.orig/odbc/odbc.m mercury-extras-10.04.1/odbc/odbc.m |
72 |
--- mercury-extras-10.04.2.orig/odbc/odbc.m 2006-08-31 23:09:50.000000000 +1200 |
73 |
+++ mercury-extras-10.04.2/odbc/odbc.m 2010-09-06 19:44:01.000000000 +1200 |
74 |
@@ -2000,8 +2000,8 @@ |
75 |
** Arbitrary size, only needs to hold a |
76 |
** descriptive string like ""SQL Server"". |
77 |
*/ |
78 |
- String new_dsn; |
79 |
- String new_desc; |
80 |
+ LPSTR new_dsn; |
81 |
+ LPSTR new_desc; |
82 |
SWORD dsn_len; |
83 |
SWORD desc_len; |
84 |
SQLRETURN rc; |
85 |
@@ -2335,7 +2335,7 @@ |
86 |
SQLSMALLINT msg_len; |
87 |
UCHAR message[SQL_MAX_MESSAGE_LENGTH]; |
88 |
UCHAR sql_state[SQL_SQLSTATE_SIZE + 1]; |
89 |
- String mercury_message; |
90 |
+ LPSTR mercury_message; |
91 |
MR_Word new_message; |
92 |
|
93 |
MR_ASSERT_IMPLY(connection_handle == SQL_NULL_HDBC, |
94 |
|
95 |
|
96 |
|
97 |
1.1 dev-lang/mercury-extras/files/mercury-extras-10.04.2-no-java-grade-no-erlang-grade.patch |
98 |
|
99 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.2-no-java-grade-no-erlang-grade.patch?rev=1.1&view=markup |
100 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.2-no-java-grade-no-erlang-grade.patch?rev=1.1&content-type=text/plain |
101 |
|
102 |
Index: mercury-extras-10.04.2-no-java-grade-no-erlang-grade.patch |
103 |
=================================================================== |
104 |
diff -urN mercury-extras-10.04.2.orig/cgi/Mmakefile mercury-extras-10.04.1/cgi/Mmakefile |
105 |
--- mercury-extras-10.04.2.orig/cgi/Mmakefile 2004-07-30 19:01:07.000000000 +1200 |
106 |
+++ mercury-extras-10.04.2/cgi/Mmakefile 2010-09-06 19:41:29.000000000 +1200 |
107 |
@@ -12,6 +12,9 @@ |
108 |
|
109 |
MAIN_TARGET = $(LIBRARY) |
110 |
|
111 |
+LIBGRADES := $(filter-out java,$(LIBGRADES)) |
112 |
+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) |
113 |
+ |
114 |
MCFLAGS-mercury_www = --no-warn-nothing-exported |
115 |
|
116 |
depend: mercury_www.depend |
117 |
diff -urN mercury-extras-10.04.2.orig/complex_numbers/Mmakefile mercury-extras-10.04.1/complex_numbers/Mmakefile |
118 |
--- mercury-extras-10.04.2.orig/complex_numbers/Mmakefile 2003-01-16 23:44:11.000000000 +1300 |
119 |
+++ mercury-extras-10.04.2/complex_numbers/Mmakefile 2010-09-06 19:41:29.000000000 +1200 |
120 |
@@ -10,6 +10,9 @@ |
121 |
|
122 |
MAIN_TARGET = all |
123 |
|
124 |
+LIBGRADES := $(filter-out java,$(LIBGRADES)) |
125 |
+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) |
126 |
+ |
127 |
all: libcomplex_numbers |
128 |
|
129 |
depend: complex_numbers.depend |
130 |
diff -urN mercury-extras-10.04.2.orig/curs/Mmakefile mercury-extras-10.04.1/curs/Mmakefile |
131 |
--- mercury-extras-10.04.2.orig/curs/Mmakefile 2003-01-16 23:44:14.000000000 +1300 |
132 |
+++ mercury-extras-10.04.2/curs/Mmakefile 2010-09-06 19:41:29.000000000 +1200 |
133 |
@@ -26,7 +26,8 @@ |
134 |
# Omit this line if you want to install the default grades. |
135 |
# Edit this line if you want to install with different grades. |
136 |
# |
137 |
-#LIBGRADES = asm_fast.gc hlc.gc |
138 |
+LIBGRADES := $(filter-out java,$(LIBGRADES)) |
139 |
+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) |
140 |
|
141 |
# The following standard libraries must be linked against in any |
142 |
# application using the curs library (i.e. MLLIBS must include |
143 |
diff -urN mercury-extras-10.04.2.orig/curses/Mmakefile mercury-extras-10.04.1/curses/Mmakefile |
144 |
--- mercury-extras-10.04.2.orig/curses/Mmakefile 2003-01-16 23:44:15.000000000 +1300 |
145 |
+++ mercury-extras-10.04.2/curses/Mmakefile 2010-09-06 19:41:29.000000000 +1200 |
146 |
@@ -13,6 +13,9 @@ |
147 |
# this line to include the appropriate curses library for your OS. |
148 |
MLLIBS = -lncurses |
149 |
|
150 |
+LIBGRADES := $(filter-out java,$(LIBGRADES)) |
151 |
+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) |
152 |
+ |
153 |
-include ../Mmake.params |
154 |
|
155 |
default_target: libmcurses |
156 |
diff -urN mercury-extras-10.04.2.orig/dynamic_linking/Mmakefile mercury-extras-10.04.1/dynamic_linking/Mmakefile |
157 |
--- mercury-extras-10.04.2.orig/dynamic_linking/Mmakefile 2005-01-25 20:49:05.000000000 +1300 |
158 |
+++ mercury-extras-10.04.2/dynamic_linking/Mmakefile 2010-09-06 19:41:29.000000000 +1200 |
159 |
@@ -17,6 +17,9 @@ |
160 |
CFLAGS = -g |
161 |
MLFLAGS += --no-strip |
162 |
|
163 |
+LIBGRADES := $(filter-out java,$(LIBGRADES)) |
164 |
+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) |
165 |
+ |
166 |
-include ../Mmake.params |
167 |
|
168 |
main_target: libdl |
169 |
diff -urN mercury-extras-10.04.2.orig/graphics/mercury_glut/Mmakefile mercury-extras-10.04.1/graphics/mercury_glut/Mmakefile |
170 |
--- mercury-extras-10.04.2.orig/graphics/mercury_glut/Mmakefile 2006-03-30 14:52:44.000000000 +1200 |
171 |
+++ mercury-extras-10.04.2/graphics/mercury_glut/Mmakefile 2010-09-06 19:41:29.000000000 +1200 |
172 |
@@ -10,6 +10,9 @@ |
173 |
|
174 |
MAIN_TARGET = libmercury_glut |
175 |
|
176 |
+LIBGRADES := $(filter-out java,$(LIBGRADES)) |
177 |
+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) |
178 |
+ |
179 |
# The following libraries are for X on Linux (Debian) using Mesa. |
180 |
|
181 |
# Libaries required by X windows. |
182 |
diff -urN mercury-extras-10.04.2.orig/graphics/mercury_opengl/Mmakefile mercury-extras-10.04.1/graphics/mercury_opengl/Mmakefile |
183 |
--- mercury-extras-10.04.2.orig/graphics/mercury_opengl/Mmakefile 2007-10-11 19:21:31.000000000 +1300 |
184 |
+++ mercury-extras-10.04.2/graphics/mercury_opengl/Mmakefile 2010-09-06 19:41:29.000000000 +1200 |
185 |
@@ -15,6 +15,9 @@ |
186 |
|
187 |
MAIN_TARGET = libmercury_opengl |
188 |
|
189 |
+LIBGRADES := $(filter-out java,$(LIBGRADES)) |
190 |
+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) |
191 |
+ |
192 |
# Specify what libraries we need to link against for OpenGL on this system. |
193 |
# (The following works on Debian with mesa as the OpenGL implementation). |
194 |
GL_LIBS = -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXt -lICE -lXext -lSM |
195 |
diff -urN mercury-extras-10.04.2.orig/graphics/mercury_tcltk/Mmakefile mercury-extras-10.04.1/graphics/mercury_tcltk/Mmakefile |
196 |
--- mercury-extras-10.04.2.orig/graphics/mercury_tcltk/Mmakefile 2005-08-15 16:11:42.000000000 +1200 |
197 |
+++ mercury-extras-10.04.2/graphics/mercury_tcltk/Mmakefile 2010-09-06 19:41:29.000000000 +1200 |
198 |
@@ -21,6 +21,9 @@ |
199 |
|
200 |
MAIN_TARGET = $(LIBRARY) |
201 |
|
202 |
+LIBGRADES := $(filter-out java,$(LIBGRADES)) |
203 |
+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) |
204 |
+ |
205 |
depend: mercury_tcltk.depend |
206 |
|
207 |
install: libmercury_tcltk.install |
208 |
diff -urN mercury-extras-10.04.2.orig/lazy_evaluation/Mmakefile mercury-extras-10.04.1/lazy_evaluation/Mmakefile |
209 |
--- mercury-extras-10.04.2.orig/lazy_evaluation/Mmakefile 2003-01-16 23:44:17.000000000 +1300 |
210 |
+++ mercury-extras-10.04.2/lazy_evaluation/Mmakefile 2010-09-06 19:41:29.000000000 +1200 |
211 |
@@ -4,6 +4,9 @@ |
212 |
# Public License - see the file COPYING.LIB in the Mercury distribution. |
213 |
#-----------------------------------------------------------------------------# |
214 |
INSTALL_PREFIX := $(INSTALL_PREFIX)/extras |
215 |
+LIBGRADES := $(filter-out java,$(LIBGRADES)) |
216 |
+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) |
217 |
+ |
218 |
-include ../Mmake.params |
219 |
default_target: all |
220 |
depend: lazy_list.depend lazy_list_test.depend |
221 |
diff -urN mercury-extras-10.04.2.orig/moose/Mmakefile mercury-extras-10.04.1/moose/Mmakefile |
222 |
--- mercury-extras-10.04.2.orig/moose/Mmakefile 2003-01-16 23:44:20.000000000 +1300 |
223 |
+++ mercury-extras-10.04.2/moose/Mmakefile 2010-09-06 19:41:29.000000000 +1200 |
224 |
@@ -6,6 +6,8 @@ |
225 |
|
226 |
# GRADE = asm_fast.gc.debug |
227 |
# GRADE = asm_fast.gc.prof |
228 |
+LIBGRADES := $(filter-out java,$(LIBGRADES)) |
229 |
+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) |
230 |
|
231 |
# MCFLAGS = -O6 |
232 |
# MCFLAGS = --intermodule-optimization -O6 |
233 |
diff -urN mercury-extras-10.04.2.orig/odbc/Mmakefile mercury-extras-10.04.1/odbc/Mmakefile |
234 |
--- mercury-extras-10.04.2.orig/odbc/Mmakefile 2006-04-03 18:19:54.000000000 +1200 |
235 |
+++ mercury-extras-10.04.2/odbc/Mmakefile 2010-09-06 19:41:29.000000000 +1200 |
236 |
@@ -8,6 +8,8 @@ |
237 |
|
238 |
#-----------------------------------------------------------------------------# |
239 |
# Configuration |
240 |
+LIBGRADES := $(filter-out java,$(LIBGRADES)) |
241 |
+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) |
242 |
|
243 |
# The driver manager. |
244 |
# Legal values for MODBC_DRIVER are MODBC_IODBC, MODBC_UNIX, and MODBC_MS. |
245 |
diff -urN mercury-extras-10.04.2.orig/posix/Mmakefile mercury-extras-10.04.1/posix/Mmakefile |
246 |
--- mercury-extras-10.04.2.orig/posix/Mmakefile 2008-09-02 21:45:54.000000000 +1200 |
247 |
+++ mercury-extras-10.04.2/posix/Mmakefile 2010-09-06 19:41:29.000000000 +1200 |
248 |
@@ -8,6 +8,9 @@ |
249 |
|
250 |
-include ../Mmake.params |
251 |
|
252 |
+LIBGRADES := $(filter-out java,$(LIBGRADES)) |
253 |
+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) |
254 |
+ |
255 |
# The following is needed (on some systems) to enable declarations of |
256 |
# Posix functions in standard C header files. |
257 |
MGNUCFLAGS = --no-ansi |
258 |
diff -urN mercury-extras-10.04.2.orig/quickcheck/Mmakefile mercury-extras-10.04.1/quickcheck/Mmakefile |
259 |
--- mercury-extras-10.04.2.orig/quickcheck/Mmakefile 2003-01-16 23:44:24.000000000 +1300 |
260 |
+++ mercury-extras-10.04.2/quickcheck/Mmakefile 2010-09-06 19:41:29.000000000 +1200 |
261 |
@@ -10,6 +10,9 @@ |
262 |
|
263 |
MAIN_TARGET = all |
264 |
|
265 |
+LIBGRADES := $(filter-out java,$(LIBGRADES)) |
266 |
+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) |
267 |
+ |
268 |
.PHONY: depend |
269 |
depend: qcheck.depend test_qcheck.depend |
270 |
|
271 |
diff -urN mercury-extras-10.04.2.orig/xml/Mmakefile mercury-extras-10.04.1/xml/Mmakefile |
272 |
--- mercury-extras-10.04.2.orig/xml/Mmakefile 2002-03-06 23:10:31.000000000 +1300 |
273 |
+++ mercury-extras-10.04.2/xml/Mmakefile 2010-09-06 19:41:29.000000000 +1200 |
274 |
@@ -8,6 +8,9 @@ |
275 |
|
276 |
INSTALL_PREFIX := $(INSTALL_PREFIX)/extras |
277 |
|
278 |
+LIBGRADES := $(filter-out java,$(LIBGRADES)) |
279 |
+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) |
280 |
+ |
281 |
.PHONY: default_target |
282 |
default_target: tryit libxml |
283 |
|
284 |
|
285 |
|
286 |
|
287 |
1.1 dev-lang/mercury-extras/files/mercury-extras-10.04.2-mercury-tcltk.patch |
288 |
|
289 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.2-mercury-tcltk.patch?rev=1.1&view=markup |
290 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.2-mercury-tcltk.patch?rev=1.1&content-type=text/plain |
291 |
|
292 |
Index: mercury-extras-10.04.2-mercury-tcltk.patch |
293 |
=================================================================== |
294 |
diff -urN mercury-extras-10.04.2.orig/graphics/mercury_tcltk/Mmakefile mercury-extras-10.04.1/graphics/mercury_tcltk/Mmakefile |
295 |
--- mercury-extras-10.04.2.orig/graphics/mercury_tcltk/Mmakefile 2005-08-15 16:11:42.000000000 +1200 |
296 |
+++ mercury-extras-10.04.2/graphics/mercury_tcltk/Mmakefile 2010-09-06 19:39:01.000000000 +1200 |
297 |
@@ -8,10 +8,7 @@ |
298 |
|
299 |
# You may need to modify the line below |
300 |
|
301 |
-MLLIBS = -ltk8.4 -ltcl8.4 -L/usr/X11R6/lib -lX11 -lXmu -lXext -lm -ldl \ |
302 |
- -lXt -lICE -lSM |
303 |
- |
304 |
-MLFLAGS = -R/usr/X11R6/lib |
305 |
+MLLIBS = -ltk -ltcl |
306 |
|
307 |
# On some Linux machines you may need to let mgnuc know where the |
308 |
# tcl/tk header files are. |
309 |
diff -urN mercury-extras-10.04.2.orig/graphics/mercury_tcltk/mtcltk.m mercury-extras-10.04.1/graphics/mercury_tcltk/mtcltk.m |
310 |
--- mercury-extras-10.04.2.orig/graphics/mercury_tcltk/mtcltk.m 2007-08-21 14:47:37.000000000 +1200 |
311 |
+++ mercury-extras-10.04.2/graphics/mercury_tcltk/mtcltk.m 2010-09-06 19:39:01.000000000 +1200 |
312 |
@@ -154,7 +154,7 @@ |
313 |
MR_incr_hp(argv_word, argc + 1); |
314 |
argv = (char **) argv_word; |
315 |
|
316 |
- for (i = 0, l = Args; l != list_empty(); l = list_tail(l), i++) { |
317 |
+ for (i = 0, l = Args; l != MR_list_empty(); l = MR_list_tail(l), i++) { |
318 |
argv[i] = (char *) MR_list_head(l); |
319 |
} |
320 |
|
321 |
|
322 |
|
323 |
|
324 |
1.1 dev-lang/mercury-extras/files/mercury-extras-10.04.2-odbc.patch |
325 |
|
326 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.2-odbc.patch?rev=1.1&view=markup |
327 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.2-odbc.patch?rev=1.1&content-type=text/plain |
328 |
|
329 |
Index: mercury-extras-10.04.2-odbc.patch |
330 |
=================================================================== |
331 |
diff -urN mercury-extras-10.04.2.orig/odbc/Mmakefile mercury-extras-10.04.1/odbc/Mmakefile |
332 |
--- mercury-extras-10.04.2.orig/odbc/Mmakefile 2006-04-03 18:19:54.000000000 +1200 |
333 |
+++ mercury-extras-10.04.2/odbc/Mmakefile 2010-09-06 19:42:52.000000000 +1200 |
334 |
@@ -41,17 +41,20 @@ |
335 |
# The following are for Debian. |
336 |
|
337 |
# for unixODBC |
338 |
- MLLIBS=-lodbc -lpthread -lltdl -ldl |
339 |
- |
340 |
+ MLLIBS=`odbc_config --libs` |
341 |
+ ODBC_CFLAGS=`odbc_config --cflags` |
342 |
# for iODBC |
343 |
# MLLIBS=-liodbc l-pthread -ldl |
344 |
# note: on a DEC Alpha using OSF1 remove the -ldl. |
345 |
endif |
346 |
|
347 |
-MAIN_TARGET=odbc_test |
348 |
+MAIN_TARGET=libodbc |
349 |
|
350 |
.PHONY: depend |
351 |
-depend: odbc_test.depend |
352 |
+depend: odbc.depend |
353 |
+ |
354 |
+.PHONY: install |
355 |
+install: libodbc.install |
356 |
|
357 |
.PHONY: check |
358 |
check: |
359 |
@@ -62,7 +65,7 @@ |
360 |
# `--no-ansi' is needed because the ODBC header files include C++-style |
361 |
# "//" comments. `--no-ansi' allows recognition of C++-style "//" comments, |
362 |
# presuming you have gcc version 2.7.1 or greater. |
363 |
-MGNUCFLAGS=--no-ansi -D$(MODBC_DRIVER) -D$(MODBC_DB) -I$(ODBC_INCL_DIR) |
364 |
+MGNUCFLAGS=--no-ansi -D$(MODBC_DRIVER) -D$(MODBC_DB) $(ODBC_CFLAGS) |
365 |
|
366 |
#-----------------------------------------------------------------------------# |
367 |
#-----------------------------------------------------------------------------# |
368 |
diff -urN mercury-extras-10.04.2.orig/odbc/odbc.m mercury-extras-10.04.1/odbc/odbc.m |
369 |
--- mercury-extras-10.04.2.orig/odbc/odbc.m 2006-08-31 23:09:50.000000000 +1200 |
370 |
+++ mercury-extras-10.04.2/odbc/odbc.m 2010-09-06 19:42:52.000000000 +1200 |
371 |
@@ -2000,8 +2000,8 @@ |
372 |
** Arbitrary size, only needs to hold a |
373 |
** descriptive string like ""SQL Server"". |
374 |
*/ |
375 |
- String new_dsn; |
376 |
- String new_desc; |
377 |
+ LPSTR new_dsn; |
378 |
+ LPSTR new_desc; |
379 |
SWORD dsn_len; |
380 |
SWORD desc_len; |
381 |
SQLRETURN rc; |
382 |
@@ -2335,7 +2335,7 @@ |
383 |
SQLSMALLINT msg_len; |
384 |
UCHAR message[SQL_MAX_MESSAGE_LENGTH]; |
385 |
UCHAR sql_state[SQL_SQLSTATE_SIZE + 1]; |
386 |
- String mercury_message; |
387 |
+ LPSTR mercury_message; |
388 |
MR_Word new_message; |
389 |
|
390 |
MR_ASSERT_IMPLY(connection_handle == SQL_NULL_HDBC, |
391 |
|
392 |
|
393 |
|
394 |
1.1 dev-lang/mercury-extras/files/mercury-extras-10.04.2-curs.patch |
395 |
|
396 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.2-curs.patch?rev=1.1&view=markup |
397 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.2-curs.patch?rev=1.1&content-type=text/plain |
398 |
|
399 |
Index: mercury-extras-10.04.2-curs.patch |
400 |
=================================================================== |
401 |
diff -urN mercury-extras-10.04.2.orig/curs/curs.m mercury-extras-10.04.1/curs/curs.m |
402 |
--- mercury-extras-10.04.2.orig/curs/curs.m 2006-04-21 15:37:10.000000000 +1200 |
403 |
+++ mercury-extras-10.04.2/curs/curs.m 2010-09-06 19:34:04.000000000 +1200 |
404 |
@@ -31,6 +31,8 @@ |
405 |
:- import_module io. |
406 |
:- import_module string. |
407 |
|
408 |
+:- include_module curs__panel. |
409 |
+ |
410 |
%-----------------------------------------------------------------------------% |
411 |
|
412 |
% Start a curses session (colour, unbuffered input, no echoing, |
413 |
@@ -210,90 +212,6 @@ |
414 |
:- func cyan = colour. |
415 |
:- func white = colour. |
416 |
|
417 |
- %-------------------------------------------------------------------------% |
418 |
- %-------------------------------------------------------------------------% |
419 |
- |
420 |
- % Panels are windows over the main display; they may be |
421 |
- % stacked, moved, ordered and hidden. Contents of panels |
422 |
- % closer to the top of the stack obscure the parts of panels |
423 |
- % they overlap that are lower in the stack. |
424 |
- % |
425 |
- :- module panel. |
426 |
- :- interface. |
427 |
- |
428 |
- :- type panel. |
429 |
- |
430 |
- % new(Rows, Cols, Row, Col, Attr, Panel) creates a new panel |
431 |
- % Panel whose size is given by (Rows, Cols) and whose position |
432 |
- % on the display is given by (Row, Col). The new panel starts |
433 |
- % visible and at the top of the stack. The default attributes |
434 |
- % for the panel are set to Attr. |
435 |
- % |
436 |
- :- pred new(int::in, int::in, int::in, int::in, attr::in, panel::out, |
437 |
- io::di, io::uo) is det. |
438 |
- |
439 |
- % Destroy a panel. |
440 |
- % |
441 |
- :- pred delete(panel::in, io::di, io::uo) is det. |
442 |
- |
443 |
- % Raise/lower a panel to the top/bottom of the stack. |
444 |
- % |
445 |
- :- pred raise(panel::in, io::di, io::uo) is det. |
446 |
- :- pred lower(panel::in, io::di, io::uo) is det. |
447 |
- |
448 |
- % Hide/reveal a panel (revealing places it at the top of the stack). |
449 |
- % |
450 |
- :- pred hide(panel::in, io::di, io::uo) is det. |
451 |
- :- pred reveal(panel::in, io::di, io::uo) is det. |
452 |
- |
453 |
- % Move a panel to (Row, Col) on the display. |
454 |
- % |
455 |
- :- pred relocate(panel::in, int::in, int::in, io::di, io::uo) is det. |
456 |
- |
457 |
- % Clear a panel. |
458 |
- % |
459 |
- :- pred clear(panel::in, io::di, io::uo) is det. |
460 |
- |
461 |
- % Move the virtual cursor to given row and column; (0, 0) are the |
462 |
- % coordinates for the upper left hand corner of the panel. |
463 |
- % |
464 |
- :- pred move(panel::in, int::in, int::in, io::di, io::uo) is det. |
465 |
- |
466 |
- % Add a char/string to a panel with the given attributes. |
467 |
- % Note that char codes are passed rather than plain chars. |
468 |
- % |
469 |
- :- pred addch(panel::in, attr::in, int::in, io::di, io::uo) is det. |
470 |
- :- pred addstr(panel::in, attr::in, string::in, io::di, io::uo) is det. |
471 |
- |
472 |
- % Turn on/off or set attributes that will be applied by default. |
473 |
- % |
474 |
- :- pred attr_on(panel::in, attr::in, io::di, io::uo) is det. |
475 |
- :- pred attr_off(panel::in, attr::in, io::di, io::uo) is det. |
476 |
- :- pred attr_set(panel::in, attr::in, io::di, io::uo) is det. |
477 |
- |
478 |
- % Update the display (also calls doupdate). |
479 |
- % NOTE: doupdate does not call update_panels. |
480 |
- % |
481 |
- :- pred update_panels(io::di, io::uo) is det. |
482 |
- |
483 |
- % Draws a border around the inside edge of the display. |
484 |
- % |
485 |
- :- pred border(panel::in, io::di, io::uo) is det. |
486 |
- |
487 |
- % Draws an horizontal line of length N moving to the right. |
488 |
- % |
489 |
- :- pred hline(panel::in, int::in, int::in, io::di, io::uo) is det. |
490 |
- |
491 |
- % Draws a vertical line of length N moving down. |
492 |
- % |
493 |
- :- pred vline(panel::in, int::in, int::in, io::di, io::uo) is det. |
494 |
- |
495 |
- :- end_module panel. |
496 |
- |
497 |
- %-------------------------------------------------------------------------% |
498 |
- %-------------------------------------------------------------------------% |
499 |
- |
500 |
-%-----------------------------------------------------------------------------% |
501 |
%-----------------------------------------------------------------------------% |
502 |
|
503 |
:- implementation. |
504 |
@@ -1044,210 +962,4 @@ |
505 |
IO = IO0; |
506 |
"). |
507 |
|
508 |
- %-------------------------------------------------------------------------% |
509 |
- %-------------------------------------------------------------------------% |
510 |
- |
511 |
- :- module panel. |
512 |
- |
513 |
- :- implementation. |
514 |
- |
515 |
- %-------------------------------------------------------------------------% |
516 |
- |
517 |
- :- pragma foreign_decl("C", " |
518 |
- |
519 |
- #include <ncurses.h> |
520 |
- #include <panel.h> |
521 |
- |
522 |
- "). |
523 |
- |
524 |
- :- pragma foreign_type("C", panel, "PANEL *"). |
525 |
- |
526 |
- %-------------------------------------------------------------------------% |
527 |
- |
528 |
- :- pragma foreign_proc("C", |
529 |
- new(Rows::in, Cols::in, Row::in, Col::in, Attr::in, Panel::out, |
530 |
- IO0::di, IO::uo), |
531 |
- [will_not_call_mercury, promise_pure], |
532 |
- " |
533 |
- WINDOW *w = newwin(Rows, Cols, Row, Col); |
534 |
- scrollok(w, TRUE); |
535 |
- wattrset(w, Attr); |
536 |
- wcolor_set(w, Attr, NULL); |
537 |
- wclear(w); |
538 |
- Panel = new_panel(w); |
539 |
- |
540 |
- IO = IO0; |
541 |
- "). |
542 |
- |
543 |
- %-------------------------------------------------------------------------% |
544 |
- |
545 |
- :- pragma foreign_proc("C", |
546 |
- delete(Panel::in, IO0::di, IO::uo), |
547 |
- [will_not_call_mercury, promise_pure], |
548 |
- " |
549 |
- delwin(panel_window(Panel)); |
550 |
- del_panel(Panel); |
551 |
- |
552 |
- IO = IO0; |
553 |
- "). |
554 |
- |
555 |
- %-------------------------------------------------------------------------% |
556 |
- |
557 |
- :- pragma foreign_proc("C", |
558 |
- raise(Panel::in, IO0::di, IO::uo), |
559 |
- [will_not_call_mercury, promise_pure], |
560 |
- " |
561 |
- top_panel(Panel); |
562 |
- IO = IO0; |
563 |
- "). |
564 |
- |
565 |
- %-------------------------------------------------------------------------% |
566 |
- |
567 |
- :- pragma foreign_proc("C", |
568 |
- lower(Panel::in, IO0::di, IO::uo), |
569 |
- [will_not_call_mercury, promise_pure], |
570 |
- " |
571 |
- bottom_panel(Panel); |
572 |
- IO = IO0; |
573 |
- "). |
574 |
- |
575 |
- %-------------------------------------------------------------------------% |
576 |
- |
577 |
- :- pragma foreign_proc("C", |
578 |
- hide(Panel::in, IO0::di, IO::uo), |
579 |
- [will_not_call_mercury, promise_pure], |
580 |
- " |
581 |
- hide_panel(Panel); |
582 |
- IO = IO0; |
583 |
- "). |
584 |
- |
585 |
- %-------------------------------------------------------------------------% |
586 |
- |
587 |
- :- pragma foreign_proc("C", |
588 |
- reveal(Panel::in, IO0::di, IO::uo), |
589 |
- [will_not_call_mercury, promise_pure], |
590 |
- " |
591 |
- show_panel(Panel); |
592 |
- IO = IO0; |
593 |
- "). |
594 |
- |
595 |
- %-------------------------------------------------------------------------% |
596 |
- |
597 |
- :- pragma foreign_proc("C", |
598 |
- relocate(Panel::in, Row::in, Col::in, IO0::di, IO::uo), |
599 |
- [will_not_call_mercury, promise_pure], |
600 |
- " |
601 |
- move_panel(Panel, Row, Col); |
602 |
- IO = IO0; |
603 |
- "). |
604 |
- |
605 |
- %-------------------------------------------------------------------------% |
606 |
- |
607 |
- :- pragma foreign_proc("C", |
608 |
- clear(Panel::in, IO0::di, IO::uo), |
609 |
- [will_not_call_mercury, promise_pure], |
610 |
- " |
611 |
- wclear(panel_window(Panel)); |
612 |
- IO = IO0; |
613 |
- "). |
614 |
- |
615 |
- %-------------------------------------------------------------------------% |
616 |
- |
617 |
- :- pragma foreign_proc("C", |
618 |
- move(Panel::in, Row::in, Col::in, IO0::di, IO::uo), |
619 |
- [will_not_call_mercury, promise_pure], |
620 |
- " |
621 |
- wmove(panel_window(Panel), Row, Col); |
622 |
- IO = IO0; |
623 |
- "). |
624 |
- |
625 |
- %-------------------------------------------------------------------------% |
626 |
- |
627 |
- :- pragma foreign_proc("C", |
628 |
- addch(Panel::in, Attr::in, CharCode::in, IO0::di, IO::uo), |
629 |
- [will_not_call_mercury, promise_pure], |
630 |
- " |
631 |
- waddch(panel_window(Panel), (chtype)Attr | (chtype)CharCode); |
632 |
- IO = IO0; |
633 |
- "). |
634 |
- |
635 |
- %-------------------------------------------------------------------------% |
636 |
- |
637 |
- addstr(Panel, Attr, Str, !IO) :- |
638 |
- string.foldl( |
639 |
- ( pred(Char::in, !.IO::di, !:IO::uo) is det :- |
640 |
- addch(Panel, Attr, char.to_int(Char), !IO) |
641 |
- ), |
642 |
- Str, !IO |
643 |
- ). |
644 |
- |
645 |
- %-------------------------------------------------------------------------% |
646 |
- |
647 |
- :- pragma foreign_proc("C", |
648 |
- attr_on(Panel::in, Attr::in, IO0::di, IO::uo), |
649 |
- [will_not_call_mercury, promise_pure], |
650 |
- " |
651 |
- wattron(panel_window(Panel), Attr); |
652 |
- IO = IO0; |
653 |
- "). |
654 |
- |
655 |
- :- pragma foreign_proc("C", |
656 |
- attr_off(Panel::in, Attr::in, IO0::di, IO::uo), |
657 |
- [will_not_call_mercury, promise_pure], |
658 |
- " |
659 |
- wattroff(panel_window(Panel), Attr); |
660 |
- IO = IO0; |
661 |
- "). |
662 |
- |
663 |
- :- pragma foreign_proc("C", |
664 |
- attr_set(Panel::in, Attr::in, IO0::di, IO::uo), |
665 |
- [will_not_call_mercury, promise_pure], |
666 |
- " |
667 |
- wattrset(panel_window(Panel), Attr); |
668 |
- IO = IO0; |
669 |
- "). |
670 |
- |
671 |
- %-------------------------------------------------------------------------% |
672 |
- |
673 |
- :- pragma foreign_proc("C", |
674 |
- update_panels(IO0::di, IO::uo), |
675 |
- [will_not_call_mercury, promise_pure], |
676 |
- " |
677 |
- update_panels(); |
678 |
- doupdate(); |
679 |
- IO = IO0; |
680 |
- "). |
681 |
- |
682 |
- %-------------------------------------------------------------------------% |
683 |
- |
684 |
- :- pragma foreign_proc("C", |
685 |
- border(Panel::in, IO0::di, IO::uo), |
686 |
- [will_not_call_mercury, promise_pure], |
687 |
- " |
688 |
- wborder(panel_window(Panel), 0, 0, 0, 0, 0, 0, 0, 0); |
689 |
- IO = IO0; |
690 |
- "). |
691 |
- |
692 |
- :- pragma foreign_proc("C", |
693 |
- hline(Panel::in, C::in, N::in, IO0::di, IO::uo), |
694 |
- [will_not_call_mercury, promise_pure], |
695 |
- " |
696 |
- whline(panel_window(Panel), C, N); |
697 |
- IO = IO0; |
698 |
- "). |
699 |
- |
700 |
- :- pragma foreign_proc("C", |
701 |
- vline(Panel::in, C::in, N::in, IO0::di, IO::uo), |
702 |
- [will_not_call_mercury, promise_pure], |
703 |
- " |
704 |
- wvline(panel_window(Panel), C, N); |
705 |
- IO = IO0; |
706 |
- "). |
707 |
- |
708 |
- %-------------------------------------------------------------------------% |
709 |
- :- end_module panel. |
710 |
- %-------------------------------------------------------------------------% |
711 |
- %-------------------------------------------------------------------------% |
712 |
- |
713 |
-%-----------------------------------------------------------------------------% |
714 |
%-----------------------------------------------------------------------------% |
715 |
|
716 |
|
717 |
|
718 |
1.1 dev-lang/mercury-extras/files/mercury-extras-10.04.2-mercury-glut.patch |
719 |
|
720 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.2-mercury-glut.patch?rev=1.1&view=markup |
721 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.2-mercury-glut.patch?rev=1.1&content-type=text/plain |
722 |
|
723 |
Index: mercury-extras-10.04.2-mercury-glut.patch |
724 |
=================================================================== |
725 |
diff -urN mercury-extras-10.04.2.orig/graphics/mercury_glut/Mmakefile mercury-extras-10.04.1/graphics/mercury_glut/Mmakefile |
726 |
--- mercury-extras-10.04.2.orig/graphics/mercury_glut/Mmakefile 2006-03-30 14:52:44.000000000 +1200 |
727 |
+++ mercury-extras-10.04.2/graphics/mercury_glut/Mmakefile 2010-09-06 19:38:06.000000000 +1200 |
728 |
@@ -13,10 +13,10 @@ |
729 |
# The following libraries are for X on Linux (Debian) using Mesa. |
730 |
|
731 |
# Libaries required by X windows. |
732 |
-X_LIBS = -lX11 -lXext -lXt -lXi -lSM -lICE -L/usr/X11R6/lib |
733 |
+#X_LIBS = -lX11 -lXext -lXt -lXi -lSM -lICE -L/usr/X11R6/lib |
734 |
|
735 |
# Libraries required by OpenGL. |
736 |
-GL_LIBS = -lGL -LGL |
737 |
+#GL_LIBS = -lGL -LGL |
738 |
|
739 |
MCFLAGS-mercury_glut+=--no-warn-nothing-exported --no-warn-interface-imports |
740 |
|
741 |
@@ -26,7 +26,7 @@ |
742 |
MGNUCFLAGS = --pic-reg |
743 |
EXTRA_MLFLAGS = -shared |
744 |
|
745 |
-MLLIBS = -lglut $(X_LIBS) $(GL_LIBS) |
746 |
+MLLIBS = -lglut |
747 |
|
748 |
depend: mercury_glut.depend |
749 |
|
750 |
|
751 |
|
752 |
|
753 |
1.1 dev-lang/mercury-extras/files/mercury-extras-10.04.2-posix.patch |
754 |
|
755 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.2-posix.patch?rev=1.1&view=markup |
756 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.2-posix.patch?rev=1.1&content-type=text/plain |
757 |
|
758 |
Index: mercury-extras-10.04.2-posix.patch |
759 |
=================================================================== |
760 |
diff -urN mercury-extras-10.04.2.orig/posix/Mmakefile mercury-extras-10.04.1/posix/Mmakefile |
761 |
--- mercury-extras-10.04.2.orig/posix/Mmakefile 2008-09-02 21:45:54.000000000 +1200 |
762 |
+++ mercury-extras-10.04.2/posix/Mmakefile 2010-09-06 19:40:40.000000000 +1200 |
763 |
@@ -34,7 +34,7 @@ |
764 |
|
765 |
.PHONY: install |
766 |
install: libposix.install |
767 |
- cp $(ADDITIONAL_HDRS) $(INSTALL_PREFIX)/lib/mercury/inc |
768 |
+ cp $(ADDITIONAL_HDRS) $(INSTALL_PREFIX)/@libdir@/mercury/inc |
769 |
|
770 |
.PHONY: clean |
771 |
clean: |
772 |
|
773 |
|
774 |
|
775 |
1.1 dev-lang/mercury-extras/files/mercury-extras-10.04.2-mercury-opengl.patch |
776 |
|
777 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.2-mercury-opengl.patch?rev=1.1&view=markup |
778 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.2-mercury-opengl.patch?rev=1.1&content-type=text/plain |
779 |
|
780 |
Index: mercury-extras-10.04.2-mercury-opengl.patch |
781 |
=================================================================== |
782 |
diff -urN mercury-extras-10.04.2.orig/graphics/mercury_opengl/Mmakefile mercury-extras-10.04.1/graphics/mercury_opengl/Mmakefile |
783 |
--- mercury-extras-10.04.2.orig/graphics/mercury_opengl/Mmakefile 2007-10-11 19:21:31.000000000 +1300 |
784 |
+++ mercury-extras-10.04.2/graphics/mercury_opengl/Mmakefile 2010-09-06 19:40:05.000000000 +1200 |
785 |
@@ -17,7 +17,8 @@ |
786 |
|
787 |
# Specify what libraries we need to link against for OpenGL on this system. |
788 |
# (The following works on Debian with mesa as the OpenGL implementation). |
789 |
-GL_LIBS = -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXt -lICE -lXext -lSM |
790 |
+GL_LIBS = `pkg-config --libs gl` `pkg-config --libs glu` |
791 |
+GL_CFLAGS = `pkg-config --cflags gl` `pkg-config --cflags glu` |
792 |
|
793 |
# Don't issue a warning because mercury_opengl doesn't export anything. |
794 |
MCFLAGS-mercury_opengl = --no-warn-nothing-exported |
795 |
@@ -26,7 +27,7 @@ |
796 |
# implemented completely. |
797 |
MCFLAGS-mogl = --no-warn-inferred-erroneous |
798 |
|
799 |
-MCFLAGS = --halt-at-warn --intermodule-optimization |
800 |
+MCFLAGS = --halt-at-warn --intermodule-optimization $(GL_CFLAGS) |
801 |
|
802 |
MLLIBS = $(GL_LIBS) $(EXTRA_MLLIBS) |
803 |
|
804 |
|
805 |
|
806 |
|
807 |
1.1 dev-lang/mercury-extras/files/mercury-extras-10.04.2-lex.patch |
808 |
|
809 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.2-lex.patch?rev=1.1&view=markup |
810 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.2-lex.patch?rev=1.1&content-type=text/plain |
811 |
|
812 |
Index: mercury-extras-10.04.2-lex.patch |
813 |
=================================================================== |
814 |
diff -urN lex/Mmakefile lex/Mmakefile |
815 |
--- lex/Mmakefile 1970-01-01 12:00:00.000000000 +1200 |
816 |
+++ lex/Mmakefile 2010-09-06 19:36:37.000000000 +1200 |
817 |
@@ -0,0 +1,29 @@ |
818 |
+# Copyright (C) 2001 Ralph Becket <rbeck@×××××××××.com> |
819 |
+# Copyright (C) 2002 The University of Melbourne |
820 |
+ |
821 |
+# To build, do the following: |
822 |
+# |
823 |
+# $ mmake depend |
824 |
+# $ mmake all |
825 |
+# $ mmake install |
826 |
+# |
827 |
+# If you have problems, try the following instead: |
828 |
+# |
829 |
+# $ mmake depend |
830 |
+# $ mmake all |
831 |
+# $ mmake liblex.install |
832 |
+# $ mmake libregex.install |
833 |
+ |
834 |
+MAIN_TARGET = all |
835 |
+ |
836 |
+LIBGRADES := $(filter-out java,$(LIBGRADES)) |
837 |
+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) |
838 |
+ |
839 |
+.PHONEY: all depend install |
840 |
+ |
841 |
+all: liblex libregex |
842 |
+ |
843 |
+depend: lex.depend regex.depend |
844 |
+ |
845 |
+install: |
846 |
+ $(MMAKE) liblex.install |
847 |
|
848 |
|
849 |
|
850 |
1.1 dev-lang/mercury-extras/files/mercury-extras-10.04.2-dynamic-linking.patch |
851 |
|
852 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.2-dynamic-linking.patch?rev=1.1&view=markup |
853 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.2-dynamic-linking.patch?rev=1.1&content-type=text/plain |
854 |
|
855 |
Index: mercury-extras-10.04.2-dynamic-linking.patch |
856 |
=================================================================== |
857 |
diff -urN mercury-extras-10.04.2.orig/dynamic_linking/Mmakefile mercury-extras-10.04.1/dynamic_linking/Mmakefile |
858 |
--- mercury-extras-10.04.2.orig/dynamic_linking/Mmakefile 2005-01-25 20:49:05.000000000 +1300 |
859 |
+++ mercury-extras-10.04.2/dynamic_linking/Mmakefile 2010-09-06 19:35:05.000000000 +1200 |
860 |
@@ -11,7 +11,7 @@ |
861 |
MLFLAGS = --shared |
862 |
|
863 |
# Link in the `-ldl' library (this may not be needed on some systems) |
864 |
-MLLIBS = -ldl |
865 |
+MLLIBS = -L/usr/@libdir@ -ldl |
866 |
|
867 |
# enable C-level debugging |
868 |
CFLAGS = -g |