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