1 |
keri 08/07/30 08:23:00 |
2 |
|
3 |
Added: qu-prolog-8.6-portage.patch |
4 |
Log: |
5 |
Version bump. |
6 |
(Portage version: 2.1.5.5) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 dev-lang/qu-prolog/files/qu-prolog-8.6-portage.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-8.6-portage.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-8.6-portage.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: qu-prolog-8.6-portage.patch |
15 |
=================================================================== |
16 |
diff -ur qp8.6.orig/Makefile.in qp8.6/Makefile.in |
17 |
--- qp8.6.orig/Makefile.in 2008-07-28 15:16:28.000000000 +1200 |
18 |
+++ qp8.6/Makefile.in 2008-07-30 19:49:45.000000000 +1200 |
19 |
@@ -14,6 +14,7 @@ |
20 |
# objects. |
21 |
# |
22 |
|
23 |
+export QPHOME = @prefix@/lib/qu-prolog |
24 |
export QPBIN = @QPHOME@/bin |
25 |
|
26 |
|
27 |
diff -ur qp8.6.orig/bin/qc.in qp8.6/bin/qc.in |
28 |
--- qp8.6.orig/bin/qc.in 2007-08-01 12:23:42.000000000 +1200 |
29 |
+++ qp8.6/bin/qc.in 2008-07-30 19:49:45.000000000 +1200 |
30 |
@@ -47,24 +47,25 @@ |
31 |
# |
32 |
# location of Qu-Prolog project |
33 |
# |
34 |
-PATH=@QPHOME@/bin:$PATH |
35 |
+QPHOME=@libdir@/qu-prolog |
36 |
+PATH=$QPHOME/bin:$PATH |
37 |
|
38 |
# |
39 |
# names of Qu-Prolog binaries |
40 |
# |
41 |
-preprocess=@QPHOME@/bin/qppp |
42 |
-expand=@QPHOME@/bin/qg |
43 |
-compile=@QPHOME@/bin/qc1 |
44 |
+preprocess=qppp |
45 |
+expand=qg |
46 |
+compile=qc1 |
47 |
compversion=qup |
48 |
-assemble=@QPHOME@/bin/qa |
49 |
-link=@QPHOME@/bin/ql |
50 |
-execute=@QPHOME@/bin/qem |
51 |
+assemble=qa |
52 |
+link=ql |
53 |
+execute=qem |
54 |
|
55 |
# |
56 |
# Use the line below when dynamic search for libraries is implemented. |
57 |
# |
58 |
# libqofiles="" |
59 |
-libqofiles="@QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo" |
60 |
+libqofiles="@QPHOME@/compiler/*.qo @QPHOME@/library/*.qo" |
61 |
|
62 |
qlfiles="" |
63 |
qlefiles="" |
64 |
@@ -327,18 +328,7 @@ |
65 |
absexecfile=$execfile |
66 |
;; |
67 |
*) |
68 |
- currdir=`pwd` |
69 |
- case $currdir in |
70 |
- /u*) |
71 |
- abspath=`echo $currdir | sed "s,/u./$HOSTNAME/,/homes/,"` |
72 |
- ;; |
73 |
- /tmp_mnt/*) |
74 |
- abspath=`echo $currdir | sed 's,/tmp_mnt/homes/[^/]*/,/homes/,'` |
75 |
- ;; |
76 |
- *) |
77 |
- abspath=$currdir |
78 |
- ;; |
79 |
- esac |
80 |
+ abspath=`pwd` |
81 |
absexecfile=$abspath/$execfile |
82 |
;; |
83 |
esac |
84 |
@@ -354,5 +344,8 @@ |
85 |
|
86 |
# make executable file |
87 |
|
88 |
-echo "exec $execute $Eoptions $lflag -Q '$savefile' \$* $*" >$execfile |
89 |
+echo "QPPATH=@prefix@/bin:$QPHOME/bin" >$execfile |
90 |
+echo "QPLIBPATH=$QPHOME/compiler:$QPHOME/library:"'$QPLIBPATH' >>$execfile |
91 |
+echo "export QPPATH QPLIBPATH" >>$execfile |
92 |
+echo "exec $execute $Eoptions $lflag -Q '$savefile' \$* $*" >>$execfile |
93 |
chmod a+x $execfile |
94 |
diff -ur qp8.6.orig/prolog/compiler/Makefile.in qp8.6/prolog/compiler/Makefile.in |
95 |
--- qp8.6.orig/prolog/compiler/Makefile.in 2008-07-28 15:16:29.000000000 +1200 |
96 |
+++ qp8.6/prolog/compiler/Makefile.in 2008-07-30 19:49:45.000000000 +1200 |
97 |
@@ -33,5 +33,5 @@ |
98 |
|
99 |
|
100 |
%.qo: %.qs |
101 |
- $(COMPILE.qc) -c -o $@ $< |
102 |
+ @QPHOME@/src/qa -i $< -o $@ |
103 |
|
104 |
diff -ur qp8.6.orig/prolog/library/Makefile.in qp8.6/prolog/library/Makefile.in |
105 |
--- qp8.6.orig/prolog/library/Makefile.in 2008-07-28 15:16:29.000000000 +1200 |
106 |
+++ qp8.6/prolog/library/Makefile.in 2008-07-30 19:49:45.000000000 +1200 |
107 |
@@ -103,4 +103,4 @@ |
108 |
|
109 |
|
110 |
%.qo: %.qs |
111 |
- $(COMPILE.qc) -c -o $@ $< |
112 |
+ @QPHOME@/src/qa -i $< -o $@ |
113 |
diff -ur qp8.6.orig/prolog/qc1/Makefile.in qp8.6/prolog/qc1/Makefile.in |
114 |
--- qp8.6.orig/prolog/qc1/Makefile.in 2008-07-28 15:16:29.000000000 +1200 |
115 |
+++ qp8.6/prolog/qc1/Makefile.in 2008-07-30 19:55:48.000000000 +1200 |
116 |
@@ -3,6 +3,7 @@ |
117 |
# |
118 |
PROGRAM = @QPHOME@/bin/qc1.qup |
119 |
|
120 |
+SAVEFILE = qc1.qx |
121 |
SOURCES = qc1.ql |
122 |
|
123 |
BASES = $(basename $(SOURCES)) |
124 |
@@ -13,12 +14,16 @@ |
125 |
all: $(PROGRAM) |
126 |
|
127 |
$(PROGRAM): $(OBJECTS) |
128 |
- $(COMPILE.qc) -L -o $(PROGRAM) $(OBJECTS) |
129 |
+ @QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo $(OBJECTS) |
130 |
+ @echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM) |
131 |
+ @echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM) |
132 |
+ @echo "export QPPATH QPLIBPATH" >>$(PROGRAM) |
133 |
+ @echo -e "exec qem -L -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM) |
134 |
|
135 |
.PHONY: clean |
136 |
clean: |
137 |
$(RM) Makefile $(OBJECTS) |
138 |
|
139 |
%.qo: %.qs |
140 |
- $(COMPILE.qc) -c -o $@ $< |
141 |
+ @QPHOME@/src/qa -i $< -o $@ |
142 |
|
143 |
diff -ur qp8.6.orig/prolog/qecat/Makefile.in qp8.6/prolog/qecat/Makefile.in |
144 |
--- qp8.6.orig/prolog/qecat/Makefile.in 2008-07-28 15:16:29.000000000 +1200 |
145 |
+++ qp8.6/prolog/qecat/Makefile.in 2008-07-30 19:55:33.000000000 +1200 |
146 |
@@ -4,6 +4,7 @@ |
147 |
|
148 |
PROGRAM = $(QPBIN)/qecat |
149 |
|
150 |
+SAVEFILE = qecat.qx |
151 |
SOURCES = qecat.ql |
152 |
|
153 |
BASES = $(basename $(SOURCES)) |
154 |
@@ -14,7 +15,11 @@ |
155 |
all: $(PROGRAM) |
156 |
|
157 |
$(PROGRAM): $(OBJECTS) |
158 |
- $(COMPILE.qc) -L -o $(PROGRAM) $(OBJECTS) |
159 |
+ @QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo $(OBJECTS) |
160 |
+ @echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM) |
161 |
+ @echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM) |
162 |
+ @echo "export QPPATH QPLIBPATH" >>$(PROGRAM) |
163 |
+ @echo -e "exec qem -L -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM) |
164 |
|
165 |
.PHONY: clean |
166 |
clean: |
167 |
@@ -22,5 +27,5 @@ |
168 |
|
169 |
|
170 |
%.qo: %.qs |
171 |
- $(COMPILE.qc) -c -o $@ $< |
172 |
+ @QPHOME@/src/qa -i $< -o $@ |
173 |
|
174 |
diff -ur qp8.6.orig/prolog/qg/Makefile.in qp8.6/prolog/qg/Makefile.in |
175 |
--- qp8.6.orig/prolog/qg/Makefile.in 2008-07-28 15:16:29.000000000 +1200 |
176 |
+++ qp8.6/prolog/qg/Makefile.in 2008-07-30 19:57:02.000000000 +1200 |
177 |
@@ -4,6 +4,7 @@ |
178 |
|
179 |
PROGRAM = @QPHOME@/bin/qg |
180 |
|
181 |
+SAVEFILE = qg.qx |
182 |
SOURCES = qg.ql |
183 |
|
184 |
BASES = $(basename $(SOURCES)) |
185 |
@@ -14,7 +15,11 @@ |
186 |
all: $(PROGRAM) |
187 |
|
188 |
$(PROGRAM): $(OBJECTS) |
189 |
- $(COMPILE.qc) -L -o $(PROGRAM) $(OBJECTS) |
190 |
+ @QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo $(OBJECTS) |
191 |
+ @echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM) |
192 |
+ @echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM) |
193 |
+ @echo "export QPPATH QPLIBPATH" >>$(PROGRAM) |
194 |
+ @echo -e "exec qem -L -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM) |
195 |
|
196 |
.PHONY: clean |
197 |
clean: |
198 |
@@ -22,5 +27,5 @@ |
199 |
|
200 |
|
201 |
%.qo: %.qs |
202 |
- $(COMPILE.qc) -c -o $@ $< |
203 |
+ @QPHOME@/src/qa -i $< -o $@ |
204 |
|
205 |
diff -ur qp8.6.orig/prolog/qp/Makefile.in qp8.6/prolog/qp/Makefile.in |
206 |
--- qp8.6.orig/prolog/qp/Makefile.in 2008-07-28 15:16:29.000000000 +1200 |
207 |
+++ qp8.6/prolog/qp/Makefile.in 2008-07-30 19:58:40.000000000 +1200 |
208 |
@@ -3,6 +3,7 @@ |
209 |
# |
210 |
PROGRAM = @QPHOME@/bin/qp |
211 |
|
212 |
+SAVEFILE = qp.qx |
213 |
SOURCES = qp.ql |
214 |
|
215 |
BASES = $(basename $(SOURCES)) |
216 |
@@ -13,7 +14,11 @@ |
217 |
all: $(PROGRAM) |
218 |
|
219 |
$(PROGRAM): $(OBJECTS) |
220 |
- $(COMPILE.qc) -o $(PROGRAM) $(OBJECTS) |
221 |
+ @QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo $(OBJECTS) |
222 |
+ @echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM) |
223 |
+ @echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM) |
224 |
+ @echo "export QPPATH QPLIBPATH" >>$(PROGRAM) |
225 |
+ @echo -e "exec qem -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM) |
226 |
|
227 |
.PHONY: clean |
228 |
clean: |
229 |
@@ -21,5 +26,5 @@ |
230 |
|
231 |
|
232 |
%.qo: %.qs |
233 |
- $(COMPILE.qc) -c -o $@ $< |
234 |
+ @QPHOME@/src/qa -i $< -o $@ |
235 |
|
236 |
diff -ur qp8.6.orig/src/Makefile.in qp8.6/src/Makefile.in |
237 |
--- qp8.6.orig/src/Makefile.in 2008-07-28 15:16:29.000000000 +1200 |
238 |
+++ qp8.6/src/Makefile.in 2008-07-30 19:49:45.000000000 +1200 |
239 |
@@ -40,7 +40,7 @@ |
240 |
|
241 |
#export DEBUGGING= |
242 |
|
243 |
-export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized |
244 |
+#export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized |
245 |
export QACXXFLAGS = -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized |
246 |
|
247 |
.PHONY: all |
248 |
@@ -79,6 +79,9 @@ |
249 |
|
250 |
# Targets |
251 |
|
252 |
+.cc.o: |
253 |
+ $(CXX) $(CXXFLAGS) @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized -c $< |
254 |
+ |
255 |
.PHONY: commands |
256 |
commands: $(GENERATED) $(LIBRARIES) $(BIG_LIBRARY) |
257 |
@$(MAKE) $(ALL_COMMANDS) |