| 1 |
keri 11/11/18 21:00:02 |
| 2 |
|
| 3 |
Added: qu-prolog-9.0-cerr-ptr.patch |
| 4 |
qu-prolog-9.0-cflags.patch |
| 5 |
qu-prolog-9.0-portage.patch |
| 6 |
Log: |
| 7 |
Version bump |
| 8 |
|
| 9 |
(Portage version: 2.1.10.11/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 dev-lang/qu-prolog/files/qu-prolog-9.0-cerr-ptr.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-9.0-cerr-ptr.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-9.0-cerr-ptr.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: qu-prolog-9.0-cerr-ptr.patch |
| 18 |
=================================================================== |
| 19 |
diff -ur qp9.0.orig/src/gc.cc qp9.0/src/gc.cc |
| 20 |
--- qp9.0.orig/src/gc.cc 2011-07-14 14:48:03.000000000 +1200 |
| 21 |
+++ qp9.0/src/gc.cc 2011-11-19 09:55:20.000000000 +1300 |
| 22 |
@@ -152,7 +152,7 @@ |
| 23 |
{ |
| 24 |
cerr << size << endl; |
| 25 |
heapobject* ptr = reinterpret_cast<heapobject*>(term); |
| 26 |
- cerr << hex << (u_int)(ptr) << " : " << *ptr << " " << *(ptr+1) << dec << endl; |
| 27 |
+ cerr << hex << (wordptr)(ptr) << " : " << *ptr << " " << *(ptr+1) << dec << endl; |
| 28 |
return false; |
| 29 |
} |
| 30 |
return true; |
| 31 |
diff -ur qp9.0.orig/src/objects.h qp9.0/src/objects.h |
| 32 |
--- qp9.0.orig/src/objects.h 2011-07-14 14:48:03.000000000 +1200 |
| 33 |
+++ qp9.0/src/objects.h 2011-11-19 09:55:20.000000000 +1300 |
| 34 |
@@ -1242,18 +1242,12 @@ |
| 35 |
<< this->getName() << "\" "; |
| 36 |
|
| 37 |
#ifndef WIN32 |
| 38 |
- switch (hasAssociatedItem()) |
| 39 |
- { |
| 40 |
- case AssociatedNone: |
| 41 |
- std::cerr << "(no info)"; |
| 42 |
- break; |
| 43 |
- case AssociatedInteger: |
| 44 |
- std::cerr << "int: " << getAssociatedInteger(); |
| 45 |
- break; |
| 46 |
- case AssociatedAtom: |
| 47 |
- std::cerr << "atom: [" << std::hex << (wordptr) getAssociatedAtom() << std::dec << "]"; |
| 48 |
- break; |
| 49 |
- } |
| 50 |
+ if (hasAssociatedInteger()) |
| 51 |
+ std::cerr << "int: " << getAssociatedInteger(); |
| 52 |
+ else if (hasAssociatedAtom()) |
| 53 |
+ std::cerr << "atom: [" << std::hex << (wordptr) getAssociatedAtom() << std::dec << "]"; |
| 54 |
+ else |
| 55 |
+ std::cerr << "(no info)"; |
| 56 |
#endif |
| 57 |
} |
| 58 |
#endif |
| 59 |
Only in qp9.0/src: objects.h.orig |
| 60 |
|
| 61 |
|
| 62 |
|
| 63 |
1.1 dev-lang/qu-prolog/files/qu-prolog-9.0-cflags.patch |
| 64 |
|
| 65 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-9.0-cflags.patch?rev=1.1&view=markup |
| 66 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-9.0-cflags.patch?rev=1.1&content-type=text/plain |
| 67 |
|
| 68 |
Index: qu-prolog-9.0-cflags.patch |
| 69 |
=================================================================== |
| 70 |
diff -ur qp9.0.orig/src/Makefile.in qp9.0/src/Makefile.in |
| 71 |
--- qp9.0.orig/src/Makefile.in 2011-07-14 14:48:14.000000000 +1200 |
| 72 |
+++ qp9.0/src/Makefile.in 2011-11-19 09:51:48.000000000 +1300 |
| 73 |
@@ -40,7 +40,7 @@ |
| 74 |
|
| 75 |
#export DEBUGGING= |
| 76 |
|
| 77 |
-export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized |
| 78 |
+#export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized |
| 79 |
export QACXXFLAGS = -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized |
| 80 |
|
| 81 |
.PHONY: all |
| 82 |
@@ -79,6 +79,9 @@ |
| 83 |
|
| 84 |
# Targets |
| 85 |
|
| 86 |
+.cc.o: |
| 87 |
+ $(CXX) $(CXXFLAGS) @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized -c $< |
| 88 |
+ |
| 89 |
.PHONY: commands |
| 90 |
commands: $(GENERATED) $(LIBRARIES) $(BIG_LIBRARY) |
| 91 |
@$(MAKE) $(ALL_COMMANDS) |
| 92 |
|
| 93 |
|
| 94 |
|
| 95 |
1.1 dev-lang/qu-prolog/files/qu-prolog-9.0-portage.patch |
| 96 |
|
| 97 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-9.0-portage.patch?rev=1.1&view=markup |
| 98 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-9.0-portage.patch?rev=1.1&content-type=text/plain |
| 99 |
|
| 100 |
Index: qu-prolog-9.0-portage.patch |
| 101 |
=================================================================== |
| 102 |
diff -ur qp9.0.orig/bin/qc.in qp9.0/bin/qc.in |
| 103 |
--- qp9.0.orig/bin/qc.in 2011-07-14 14:47:48.000000000 +1200 |
| 104 |
+++ qp9.0/bin/qc.in 2011-11-19 09:50:05.000000000 +1300 |
| 105 |
@@ -27,13 +27,13 @@ |
| 106 |
|
| 107 |
############################## |
| 108 |
|
| 109 |
-preprocess='@QPHOME@/bin/qppp' |
| 110 |
-expand='@QPHOME@/bin/qg' |
| 111 |
-qpcompile='@QPHOME@/bin/qc1' |
| 112 |
+preprocess='qppp' |
| 113 |
+expand='qg' |
| 114 |
+qpcompile='qc1' |
| 115 |
compversion='qup' |
| 116 |
-assemble='@QPHOME@/bin/qa' |
| 117 |
-link='@QPHOME@/bin/ql' |
| 118 |
-execute='@QPHOME@/bin/qem' |
| 119 |
+assemble='qa' |
| 120 |
+link='ql' |
| 121 |
+execute='qem' |
| 122 |
libqofiles="@QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo" |
| 123 |
|
| 124 |
############################## |
| 125 |
diff -ur qp9.0.orig/prolog/Makefile.in qp9.0/prolog/Makefile.in |
| 126 |
--- qp9.0.orig/prolog/Makefile.in 2006-04-06 16:01:45.000000000 +1200 |
| 127 |
+++ qp9.0/prolog/Makefile.in 2011-11-19 09:50:05.000000000 +1300 |
| 128 |
@@ -1,3 +1,5 @@ |
| 129 |
+PATH:=$(PATH):@QPHOME@/bin |
| 130 |
+ |
| 131 |
.DEFAULT: |
| 132 |
@$(MAKE) -C compiler $@ |
| 133 |
@$(MAKE) -C library $@ |
Archives