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/qu-prolog/files: qu-prolog-8.3-gcc4.patch qu-prolog-8.3-debug.patch digest-qu-prolog-8.3 qu-prolog-8.3-portage.patch qu-prolog-8.3-configure.patch
Date: Sat, 22 Dec 2007 06:28:37
Message-Id: E1J5xqX-00077l-Gt@stork.gentoo.org
1 keri 07/12/22 06:28:29
2
3 Added: qu-prolog-8.3-gcc4.patch qu-prolog-8.3-debug.patch
4 digest-qu-prolog-8.3 qu-prolog-8.3-portage.patch
5 qu-prolog-8.3-configure.patch
6 Log:
7 Version bump.
8 (Portage version: 2.1.4_rc10)
9
10 Revision Changes Path
11 1.1 dev-lang/qu-prolog/files/qu-prolog-8.3-gcc4.patch
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-8.3-gcc4.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-8.3-gcc4.patch?rev=1.1&content-type=text/plain
15
16 Index: qu-prolog-8.3-gcc4.patch
17 ===================================================================
18 Only in qp8.3: configure.orig
19 Only in qp8.3/src: io.cc.orig
20 Only in qp8.3/src: thread_escapes.cc.orig
21 diff -ur qp8.3.orig/src/xqp/interact.h qp8.3/src/xqp/interact.h
22 --- qp8.3.orig/src/xqp/interact.h 2007-03-02 13:25:06.000000000 +1300
23 +++ qp8.3/src/xqp/interact.h 2007-12-22 19:13:25.000000000 +1300
24 @@ -27,7 +27,7 @@
25 #include <QMouseEvent>
26 #include <QKeyEvent>
27 #include <Q3PtrList>
28 -#include <fstream.h>
29 +#include <fstream>
30 #include <q3accel.h>
31 #include <qregexp.h>
32 #include <qsocketnotifier.h>
33 diff -ur qp8.3.orig/src/xqp/main.cc qp8.3/src/xqp/main.cc
34 --- qp8.3.orig/src/xqp/main.cc 2006-04-06 16:01:45.000000000 +1200
35 +++ qp8.3/src/xqp/main.cc 2007-12-22 19:13:25.000000000 +1300
36 @@ -19,9 +19,9 @@
37
38 #include <stdlib.h>
39 #include <stdio.h>
40 -#include <iostream.h>
41 +#include <iostream>
42 #include <unistd.h>
43 -#include <fstream.h>
44 +#include <fstream>
45 #include <sys/types.h>
46 #include <sys/stat.h>
47 #include <fcntl.h>
48 @@ -30,6 +30,7 @@
49
50 #include "xqp.h"
51
52 +using namespace std;
53
54 // Create 2 sockets for unidirectional communication to and from qp
55 int socket_main_to_qp[2], socket_qp_to_main[2];
56
57
58
59 1.1 dev-lang/qu-prolog/files/qu-prolog-8.3-debug.patch
60
61 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-8.3-debug.patch?rev=1.1&view=markup
62 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-8.3-debug.patch?rev=1.1&content-type=text/plain
63
64 Index: qu-prolog-8.3-debug.patch
65 ===================================================================
66 Only in qp8.3: configure.orig
67 diff -ur qp8.3.orig/src/io.cc qp8.3/src/io.cc
68 --- qp8.3.orig/src/io.cc 2007-12-13 15:45:57.000000000 +1300
69 +++ qp8.3/src/io.cc 2007-12-22 19:12:41.000000000 +1300
70 @@ -914,8 +914,7 @@
71 }
72
73 #ifdef DEBUG_IO
74 - cerr.form("%s result = %ld FD_ISSET(%ld, ...) = %ld\n",
75 - __FUNCTION__, result, fd, FD_ISSET(fd, &fds));
76 + cerr << __FUNCTION__ << " result = " << result << "FD_ISSET(" << fd << ", ...) = " << FD_ISSET(fd, &fds) << endl;
77 #endif
78 #ifdef WIN32
79 if (result == 0 || result == 128)
80 diff -ur qp8.3.orig/src/thread_escapes.cc qp8.3/src/thread_escapes.cc
81 --- qp8.3.orig/src/thread_escapes.cc 2007-12-13 15:45:57.000000000 +1300
82 +++ qp8.3/src/thread_escapes.cc 2007-12-22 19:12:41.000000000 +1300
83 @@ -212,8 +212,7 @@
84 thread_table->IncLive();
85
86 #ifdef DEBUG_MT
87 - printf("%s Thread %ld, %ld now live\n",
88 - __FUNCTION__, thread->TInfo().ID(), thread_table->Live());
89 + cout << __FUNCTION__ << " Thread " << thread->TInfo().ID() << ", " << thread_table->Live() << " now live" << endl;
90 // heap.DisplayTerm(cerr, *atoms, argG);
91 #endif
92
93 @@ -541,7 +540,7 @@
94 Condition(ThreadCondition::EXITED);
95
96 #ifdef DEBUG_MT
97 - cerr.form("%s %ld\n", __FUNCTION__, TInfo().ID());
98 + cerr << __FUNCTION__ << " " << TInfo().ID() << endl;
99 #endif
100
101 if (TInfo().SymbolSet())
102 @@ -948,7 +947,7 @@
103 thread->Condition(ThreadCondition::EXITED);
104
105 #ifdef DEBUG_MT
106 - cerr.form("%s %ld\n", __FUNCTION__, thread->TInfo().ID());
107 + cerr << __FUNCTION__ << " " << thread->TInfo().ID();
108 #endif
109
110 if (thread->TInfo().SymbolSet())
111
112
113
114 1.1 dev-lang/qu-prolog/files/digest-qu-prolog-8.3
115
116 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/qu-prolog/files/digest-qu-prolog-8.3?rev=1.1&view=markup
117 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/qu-prolog/files/digest-qu-prolog-8.3?rev=1.1&content-type=text/plain
118
119 Index: digest-qu-prolog-8.3
120 ===================================================================
121 MD5 6988142113ddc2883f4153bd935dda88 qp8.3.tar.gz 1222502
122 RMD160 71530d2cd3387f9c66508493d646be9c5c86c64c qp8.3.tar.gz 1222502
123 SHA256 d7ed814af801f89b17e9c604da241dc0a9ffa1ccdd6a0f89ea22f29ebabd8d95 qp8.3.tar.gz 1222502
124 MD5 924e6409600dcda92ed193e3a0b6a95e qu-prolog-8.3-xqp-qt4.tar.gz 8502
125 RMD160 97d04dc0581f8266253d0b4f4038418d36a4b757 qu-prolog-8.3-xqp-qt4.tar.gz 8502
126 SHA256 d07342c1a8df408f1b71ee9af4bbe2dea2478ca3596e0ef44c6dc3cfd4e507ce qu-prolog-8.3-xqp-qt4.tar.gz 8502
127
128
129
130 1.1 dev-lang/qu-prolog/files/qu-prolog-8.3-portage.patch
131
132 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-8.3-portage.patch?rev=1.1&view=markup
133 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-8.3-portage.patch?rev=1.1&content-type=text/plain
134
135 Index: qu-prolog-8.3-portage.patch
136 ===================================================================
137 diff -ur qp8.3.orig/Makefile.in qp8.3/Makefile.in
138 --- qp8.3.orig/Makefile.in 2007-12-13 15:46:20.000000000 +1300
139 +++ qp8.3/Makefile.in 2007-12-22 19:14:09.000000000 +1300
140 @@ -14,6 +14,7 @@
141 # objects.
142 #
143
144 +export QPHOME = @prefix@/lib/qu-prolog
145 export QPBIN = @QPHOME@/bin
146
147
148 @@ -34,7 +35,6 @@
149 objects:
150 @$(MAKE) -C @QPHOME@/bin $(PARALLEL) all
151 @$(MAKE) -C @QPHOME@/src $(PARALLEL) all
152 - @$(MAKE) -C @QPHOME@/src $(PARALLEL) install
153 @$(MAKE) -C @QPHOME@/prolog $(PARALLEL) all
154
155
156 diff -ur qp8.3.orig/bin/qc.in qp8.3/bin/qc.in
157 --- qp8.3.orig/bin/qc.in 2007-08-01 12:23:42.000000000 +1200
158 +++ qp8.3/bin/qc.in 2007-12-22 19:14:09.000000000 +1300
159 @@ -47,24 +47,25 @@
160 #
161 # location of Qu-Prolog project
162 #
163 -PATH=@QPHOME@/bin:$PATH
164 +QPHOME=@libdir@/qu-prolog
165 +PATH=$QPHOME/bin:$PATH
166
167 #
168 # names of Qu-Prolog binaries
169 #
170 -preprocess=@QPHOME@/bin/qppp
171 -expand=@QPHOME@/bin/qg
172 -compile=@QPHOME@/bin/qc1
173 +preprocess=qppp
174 +expand=qg
175 +compile=qc1
176 compversion=qup
177 -assemble=@QPHOME@/bin/qa
178 -link=@QPHOME@/bin/ql
179 -execute=@QPHOME@/bin/qem
180 +assemble=qa
181 +link=ql
182 +execute=qem
183
184 #
185 # Use the line below when dynamic search for libraries is implemented.
186 #
187 # libqofiles=""
188 -libqofiles="@QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo"
189 +libqofiles="@QPHOME@/compiler/*.qo @QPHOME@/library/*.qo"
190
191 qlfiles=""
192 qlefiles=""
193 @@ -327,18 +328,7 @@
194 absexecfile=$execfile
195 ;;
196 *)
197 - currdir=`pwd`
198 - case $currdir in
199 - /u*)
200 - abspath=`echo $currdir | sed "s,/u./$HOSTNAME/,/homes/,"`
201 - ;;
202 - /tmp_mnt/*)
203 - abspath=`echo $currdir | sed 's,/tmp_mnt/homes/[^/]*/,/homes/,'`
204 - ;;
205 - *)
206 - abspath=$currdir
207 - ;;
208 - esac
209 + abspath=`pwd`
210 absexecfile=$abspath/$execfile
211 ;;
212 esac
213 @@ -354,5 +344,8 @@
214
215 # make executable file
216
217 -echo "exec $execute $Eoptions $lflag -Q '$savefile' \$* $*" >$execfile
218 +echo "QPPATH=@prefix@/bin:$QPHOME/bin" >$execfile
219 +echo "QPLIBPATH=$QPHOME/compiler:$QPHOME/library:"'$QPLIBPATH' >>$execfile
220 +echo "export QPPATH QPLIBPATH" >>$execfile
221 +echo "exec $execute $Eoptions $lflag -Q '$savefile' \$* $*" >>$execfile
222 chmod a+x $execfile
223 Only in qp8.3: configure.orig
224 diff -ur qp8.3.orig/prolog/compiler/Makefile.in qp8.3/prolog/compiler/Makefile.in
225 --- qp8.3.orig/prolog/compiler/Makefile.in 2007-12-13 15:46:22.000000000 +1300
226 +++ qp8.3/prolog/compiler/Makefile.in 2007-12-22 19:14:09.000000000 +1300
227 @@ -29,5 +29,5 @@
228
229
230 %.qo: %.qs
231 - $(COMPILE.qc) -c -o $@ $<
232 + @QPHOME@/src/qa -i $< -o $@
233
234 diff -ur qp8.3.orig/prolog/library/Makefile.in qp8.3/prolog/library/Makefile.in
235 --- qp8.3.orig/prolog/library/Makefile.in 2007-12-13 15:46:22.000000000 +1300
236 +++ qp8.3/prolog/library/Makefile.in 2007-12-22 19:14:09.000000000 +1300
237 @@ -99,4 +99,4 @@
238
239
240 %.qo: %.qs
241 - $(COMPILE.qc) -c -o $@ $<
242 + @QPHOME@/src/qa -i $< -o $@
243 diff -ur qp8.3.orig/prolog/qc1/Makefile.in qp8.3/prolog/qc1/Makefile.in
244 --- qp8.3.orig/prolog/qc1/Makefile.in 2007-12-13 15:46:22.000000000 +1300
245 +++ qp8.3/prolog/qc1/Makefile.in 2007-12-22 19:14:09.000000000 +1300
246 @@ -3,6 +3,7 @@
247 #
248 PROGRAM = @QPHOME@/bin/qc1.qup
249
250 +SAVEFILE = qc1.qx
251 SOURCES = qc1.ql
252
253 BASES = $(basename $(SOURCES))
254 @@ -13,8 +14,12 @@
255 all: $(PROGRAM)
256
257 $(PROGRAM): $(OBJECTS)
258 - $(COMPILE.qc) -L -o $(PROGRAM) $(OBJECTS)
259 + @QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo $(OBJECTS)
260 + @echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM)
261 + @echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM)
262 + @echo "export QPPATH QPLIBPATH" >>$(PROGRAM)
263 + @echo -e "exec qem -L -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM)
264
265 %.qo: %.qs
266 - $(COMPILE.qc) -c -o $@ $<
267 + @QPHOME@/src/qa -i $< -o $@
268
269 diff -ur qp8.3.orig/prolog/qecat/Makefile.in qp8.3/prolog/qecat/Makefile.in
270 --- qp8.3.orig/prolog/qecat/Makefile.in 2007-12-13 15:46:22.000000000 +1300
271 +++ qp8.3/prolog/qecat/Makefile.in 2007-12-22 19:14:09.000000000 +1300
272 @@ -4,6 +4,7 @@
273
274 PROGRAM = $(QPBIN)/qecat
275
276 +SAVEFILE = qecat.qx
277 SOURCES = qecat.ql
278
279 BASES = $(basename $(SOURCES))
280 @@ -14,9 +15,13 @@
281 all: $(PROGRAM)
282
283 $(PROGRAM): $(OBJECTS)
284 - $(COMPILE.qc) -L -o $(PROGRAM) $(OBJECTS)
285 + @QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo $(OBJECTS)
286 + @echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM)
287 + @echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM)
288 + @echo "export QPPATH QPLIBPATH" >>$(PROGRAM)
289 + @echo -e "exec qem -L -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM)
290
291
292 %.qo: %.qs
293 - $(COMPILE.qc) -c -o $@ $<
294 + @QPHOME@/src/qa -i $< -o $@
295
296 diff -ur qp8.3.orig/prolog/qg/Makefile.in qp8.3/prolog/qg/Makefile.in
297 --- qp8.3.orig/prolog/qg/Makefile.in 2007-12-13 15:46:22.000000000 +1300
298 +++ qp8.3/prolog/qg/Makefile.in 2007-12-22 19:14:09.000000000 +1300
299 @@ -4,6 +4,7 @@
300
301 PROGRAM = @QPHOME@/bin/qg
302
303 +SAVEFILE = qg.qx
304 SOURCES = qg.ql
305
306 BASES = $(basename $(SOURCES))
307 @@ -14,9 +15,13 @@
308 all: $(PROGRAM)
309
310 $(PROGRAM): $(OBJECTS)
311 - $(COMPILE.qc) -L -o $(PROGRAM) $(OBJECTS)
312 + @QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo $(OBJECTS)
313 + @echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM)
314 + @echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM)
315 + @echo "export QPPATH QPLIBPATH" >>$(PROGRAM)
316 + @echo -e "exec qem -L -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM)
317
318
319 %.qo: %.qs
320 - $(COMPILE.qc) -c -o $@ $<
321 + @QPHOME@/src/qa -i $< -o $@
322
323 diff -ur qp8.3.orig/prolog/qp/Makefile.in qp8.3/prolog/qp/Makefile.in
324 --- qp8.3.orig/prolog/qp/Makefile.in 2007-12-13 15:46:22.000000000 +1300
325 +++ qp8.3/prolog/qp/Makefile.in 2007-12-22 19:14:09.000000000 +1300
326 @@ -3,6 +3,7 @@
327 #
328 PROGRAM = @QPHOME@/bin/qp
329
330 +SAVEFILE = qp.qx
331 SOURCES = qp.ql
332
333 BASES = $(basename $(SOURCES))
334 @@ -13,9 +14,13 @@
335 all: $(PROGRAM)
336
337 $(PROGRAM): $(OBJECTS)
338 - $(COMPILE.qc) -o $(PROGRAM) $(OBJECTS)
339 + @QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo $(OBJECTS)
340 + @echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM)
341 + @echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM)
342 + @echo "export QPPATH QPLIBPATH" >>$(PROGRAM)
343 + @echo -e "exec qem -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM)
344
345
346 %.qo: %.qs
347 - $(COMPILE.qc) -c -o $@ $<
348 + @QPHOME@/src/qa -i $< -o $@
349
350 diff -ur qp8.3.orig/src/Makefile.in qp8.3/src/Makefile.in
351 --- qp8.3.orig/src/Makefile.in 2007-12-13 15:46:22.000000000 +1300
352 +++ qp8.3/src/Makefile.in 2007-12-22 19:14:09.000000000 +1300
353 @@ -39,7 +39,7 @@
354
355 #export DEBUGGING=
356
357 -export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
358 +#export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
359 export QACXXFLAGS = -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
360
361 .PHONY: all
362 @@ -78,6 +78,9 @@
363
364 # Targets
365
366 +.cc.o:
367 + $(CXX) $(CXXFLAGS) @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized -c $<
368 +
369 .PHONY: commands
370 commands: $(GENERATED) $(LIBRARIES) $(BIG_LIBRARY)
371 @$(MAKE) $(ALL_COMMANDS)
372 Only in qp8.3/src: io.cc.orig
373 Only in qp8.3/src: thread_escapes.cc.orig
374 Only in qp8.3/src/xqp: interact.h.orig
375 Only in qp8.3/src/xqp: main.cc.orig
376
377
378
379 1.1 dev-lang/qu-prolog/files/qu-prolog-8.3-configure.patch
380
381 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-8.3-configure.patch?rev=1.1&view=markup
382 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-8.3-configure.patch?rev=1.1&content-type=text/plain
383
384 Index: qu-prolog-8.3-configure.patch
385 ===================================================================
386 --- qp8.3.orig/configure 2007-12-13 15:46:22.000000000 +1300
387 +++ qp8.3/configure 2007-12-22 19:10:16.000000000 +1300
388 @@ -3786,6 +3786,8 @@
389
390 fi
391
392 +if false; then
393 +
394 # Extract the first word of "perl", so it can be a program name with args.
395 set dummy perl; ac_word=$2
396 { echo "$as_me:$LINENO: checking for $ac_word" >&5
397 @@ -3836,6 +3838,7 @@
398 { (exit 1); exit 1; }; }
399 fi
400
401 +fi
402
403 GCCINCLUDES=
404
405
406
407
408 --
409 gentoo-commits@g.o mailing list
Report Message
Find on MARC Find on Google Groups