keri 07/12/22 06:28:29
Added: 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
Log:
Version bump.
(Portage version: 2.1.4_rc10)
Revision Changes Path
1.1 dev-lang/qu-prolog/files/qu-prolog-8.3-gcc4.patch
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
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
Index: qu-prolog-8.3-gcc4.patch
===================================================================
Only in qp8.3: configure.orig
Only in qp8.3/src: io.cc.orig
Only in qp8.3/src: thread_escapes.cc.orig
diff -ur qp8.3.orig/src/xqp/interact.h qp8.3/src/xqp/interact.h
--- qp8.3.orig/src/xqp/interact.h 2007-03-02 13:25:06.000000000 +1300
+++ qp8.3/src/xqp/interact.h 2007-12-22 19:13:25.000000000 +1300
@@ -27,7 +27,7 @@
#include <QMouseEvent>
#include <QKeyEvent>
#include <Q3PtrList>
-#include <fstream.h>
+#include <fstream>
#include <q3accel.h>
#include <qregexp.h>
#include <qsocketnotifier.h>
diff -ur qp8.3.orig/src/xqp/main.cc qp8.3/src/xqp/main.cc
--- qp8.3.orig/src/xqp/main.cc 2006-04-06 16:01:45.000000000 +1200
+++ qp8.3/src/xqp/main.cc 2007-12-22 19:13:25.000000000 +1300
@@ -19,9 +19,9 @@
#include <stdlib.h>
#include <stdio.h>
-#include <iostream.h>
+#include <iostream>
#include <unistd.h>
-#include <fstream.h>
+#include <fstream>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
@@ -30,6 +30,7 @@
#include "xqp.h"
+using namespace std;
// Create 2 sockets for unidirectional communication to and from qp
int socket_main_to_qp[2], socket_qp_to_main[2];
1.1 dev-lang/qu-prolog/files/qu-prolog-8.3-debug.patch
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
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
Index: qu-prolog-8.3-debug.patch
===================================================================
Only in qp8.3: configure.orig
diff -ur qp8.3.orig/src/io.cc qp8.3/src/io.cc
--- qp8.3.orig/src/io.cc 2007-12-13 15:45:57.000000000 +1300
+++ qp8.3/src/io.cc 2007-12-22 19:12:41.000000000 +1300
@@ -914,8 +914,7 @@
}
#ifdef DEBUG_IO
- cerr.form("%s result = %ld FD_ISSET(%ld, ...) = %ld\n",
- __FUNCTION__, result, fd, FD_ISSET(fd, &fds));
+ cerr << __FUNCTION__ << " result = " << result << "FD_ISSET(" << fd << ", ...) = " << FD_ISSET(fd, &fds) << endl;
#endif
#ifdef WIN32
if (result == 0 || result == 128)
diff -ur qp8.3.orig/src/thread_escapes.cc qp8.3/src/thread_escapes.cc
--- qp8.3.orig/src/thread_escapes.cc 2007-12-13 15:45:57.000000000 +1300
+++ qp8.3/src/thread_escapes.cc 2007-12-22 19:12:41.000000000 +1300
@@ -212,8 +212,7 @@
thread_table->IncLive();
#ifdef DEBUG_MT
- printf("%s Thread %ld, %ld now live\n",
- __FUNCTION__, thread->TInfo().ID(), thread_table->Live());
+ cout << __FUNCTION__ << " Thread " << thread->TInfo().ID() << ", " << thread_table->Live() << " now live" << endl;
// heap.DisplayTerm(cerr, *atoms, argG);
#endif
@@ -541,7 +540,7 @@
Condition(ThreadCondition::EXITED);
#ifdef DEBUG_MT
- cerr.form("%s %ld\n", __FUNCTION__, TInfo().ID());
+ cerr << __FUNCTION__ << " " << TInfo().ID() << endl;
#endif
if (TInfo().SymbolSet())
@@ -948,7 +947,7 @@
thread->Condition(ThreadCondition::EXITED);
#ifdef DEBUG_MT
- cerr.form("%s %ld\n", __FUNCTION__, thread->TInfo().ID());
+ cerr << __FUNCTION__ << " " << thread->TInfo().ID();
#endif
if (thread->TInfo().SymbolSet())
1.1 dev-lang/qu-prolog/files/digest-qu-prolog-8.3
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/qu-prolog/files/digest-qu-prolog-8.3?rev=1.1&view=markup
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
Index: digest-qu-prolog-8.3
===================================================================
MD5 6988142113ddc2883f4153bd935dda88 qp8.3.tar.gz 1222502
RMD160 71530d2cd3387f9c66508493d646be9c5c86c64c qp8.3.tar.gz 1222502
SHA256 d7ed814af801f89b17e9c604da241dc0a9ffa1ccdd6a0f89ea22f29ebabd8d95 qp8.3.tar.gz 1222502
MD5 924e6409600dcda92ed193e3a0b6a95e qu-prolog-8.3-xqp-qt4.tar.gz 8502
RMD160 97d04dc0581f8266253d0b4f4038418d36a4b757 qu-prolog-8.3-xqp-qt4.tar.gz 8502
SHA256 d07342c1a8df408f1b71ee9af4bbe2dea2478ca3596e0ef44c6dc3cfd4e507ce qu-prolog-8.3-xqp-qt4.tar.gz 8502
1.1 dev-lang/qu-prolog/files/qu-prolog-8.3-portage.patch
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
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
Index: qu-prolog-8.3-portage.patch
===================================================================
diff -ur qp8.3.orig/Makefile.in qp8.3/Makefile.in
--- qp8.3.orig/Makefile.in 2007-12-13 15:46:20.000000000 +1300
+++ qp8.3/Makefile.in 2007-12-22 19:14:09.000000000 +1300
@@ -14,6 +14,7 @@
# objects.
#
+export QPHOME = @prefix@/lib/qu-prolog
export QPBIN = @QPHOME@/bin
@@ -34,7 +35,6 @@
objects:
@$(MAKE) -C @QPHOME@/bin $(PARALLEL) all
@$(MAKE) -C @QPHOME@/src $(PARALLEL) all
- @$(MAKE) -C @QPHOME@/src $(PARALLEL) install
@$(MAKE) -C @QPHOME@/prolog $(PARALLEL) all
diff -ur qp8.3.orig/bin/qc.in qp8.3/bin/qc.in
--- qp8.3.orig/bin/qc.in 2007-08-01 12:23:42.000000000 +1200
+++ qp8.3/bin/qc.in 2007-12-22 19:14:09.000000000 +1300
@@ -47,24 +47,25 @@
#
# location of Qu-Prolog project
#
-PATH=@QPHOME@/bin:$PATH
+QPHOME=@libdir@/qu-prolog
+PATH=$QPHOME/bin:$PATH
#
# names of Qu-Prolog binaries
#
-preprocess=@QPHOME@/bin/qppp
-expand=@QPHOME@/bin/qg
-compile=@QPHOME@/bin/qc1
+preprocess=qppp
+expand=qg
+compile=qc1
compversion=qup
-assemble=@QPHOME@/bin/qa
-link=@QPHOME@/bin/ql
-execute=@QPHOME@/bin/qem
+assemble=qa
+link=ql
+execute=qem
#
# Use the line below when dynamic search for libraries is implemented.
#
# libqofiles=""
-libqofiles="@QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo"
+libqofiles="@QPHOME@/compiler/*.qo @QPHOME@/library/*.qo"
qlfiles=""
qlefiles=""
@@ -327,18 +328,7 @@
absexecfile=$execfile
;;
*)
- currdir=`pwd`
- case $currdir in
- /u*)
- abspath=`echo $currdir | sed "s,/u./$HOSTNAME/,/homes/,"`
- ;;
- /tmp_mnt/*)
- abspath=`echo $currdir | sed 's,/tmp_mnt/homes/[^/]*/,/homes/,'`
- ;;
- *)
- abspath=$currdir
- ;;
- esac
+ abspath=`pwd`
absexecfile=$abspath/$execfile
;;
esac
@@ -354,5 +344,8 @@
# make executable file
-echo "exec $execute $Eoptions $lflag -Q '$savefile' \$* $*" >$execfile
+echo "QPPATH=@prefix@/bin:$QPHOME/bin" >$execfile
+echo "QPLIBPATH=$QPHOME/compiler:$QPHOME/library:"'$QPLIBPATH' >>$execfile
+echo "export QPPATH QPLIBPATH" >>$execfile
+echo "exec $execute $Eoptions $lflag -Q '$savefile' \$* $*" >>$execfile
chmod a+x $execfile
Only in qp8.3: configure.orig
diff -ur qp8.3.orig/prolog/compiler/Makefile.in qp8.3/prolog/compiler/Makefile.in
--- qp8.3.orig/prolog/compiler/Makefile.in 2007-12-13 15:46:22.000000000 +1300
+++ qp8.3/prolog/compiler/Makefile.in 2007-12-22 19:14:09.000000000 +1300
@@ -29,5 +29,5 @@
%.qo: %.qs
- $(COMPILE.qc) -c -o $@ $<
+ @QPHOME@/src/qa -i $< -o $@
diff -ur qp8.3.orig/prolog/library/Makefile.in qp8.3/prolog/library/Makefile.in
--- qp8.3.orig/prolog/library/Makefile.in 2007-12-13 15:46:22.000000000 +1300
+++ qp8.3/prolog/library/Makefile.in 2007-12-22 19:14:09.000000000 +1300
@@ -99,4 +99,4 @@
%.qo: %.qs
- $(COMPILE.qc) -c -o $@ $<
+ @QPHOME@/src/qa -i $< -o $@
diff -ur qp8.3.orig/prolog/qc1/Makefile.in qp8.3/prolog/qc1/Makefile.in
--- qp8.3.orig/prolog/qc1/Makefile.in 2007-12-13 15:46:22.000000000 +1300
+++ qp8.3/prolog/qc1/Makefile.in 2007-12-22 19:14:09.000000000 +1300
@@ -3,6 +3,7 @@
#
PROGRAM = @QPHOME@/bin/qc1.qup
+SAVEFILE = qc1.qx
SOURCES = qc1.ql
BASES = $(basename $(SOURCES))
@@ -13,8 +14,12 @@
all: $(PROGRAM)
$(PROGRAM): $(OBJECTS)
- $(COMPILE.qc) -L -o $(PROGRAM) $(OBJECTS)
+ @QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo $(OBJECTS)
+ @echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM)
+ @echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM)
+ @echo "export QPPATH QPLIBPATH" >>$(PROGRAM)
+ @echo -e "exec qem -L -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM)
%.qo: %.qs
- $(COMPILE.qc) -c -o $@ $<
+ @QPHOME@/src/qa -i $< -o $@
diff -ur qp8.3.orig/prolog/qecat/Makefile.in qp8.3/prolog/qecat/Makefile.in
--- qp8.3.orig/prolog/qecat/Makefile.in 2007-12-13 15:46:22.000000000 +1300
+++ qp8.3/prolog/qecat/Makefile.in 2007-12-22 19:14:09.000000000 +1300
@@ -4,6 +4,7 @@
PROGRAM = $(QPBIN)/qecat
+SAVEFILE = qecat.qx
SOURCES = qecat.ql
BASES = $(basename $(SOURCES))
@@ -14,9 +15,13 @@
all: $(PROGRAM)
$(PROGRAM): $(OBJECTS)
- $(COMPILE.qc) -L -o $(PROGRAM) $(OBJECTS)
+ @QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo $(OBJECTS)
+ @echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM)
+ @echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM)
+ @echo "export QPPATH QPLIBPATH" >>$(PROGRAM)
+ @echo -e "exec qem -L -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM)
%.qo: %.qs
- $(COMPILE.qc) -c -o $@ $<
+ @QPHOME@/src/qa -i $< -o $@
diff -ur qp8.3.orig/prolog/qg/Makefile.in qp8.3/prolog/qg/Makefile.in
--- qp8.3.orig/prolog/qg/Makefile.in 2007-12-13 15:46:22.000000000 +1300
+++ qp8.3/prolog/qg/Makefile.in 2007-12-22 19:14:09.000000000 +1300
@@ -4,6 +4,7 @@
PROGRAM = @QPHOME@/bin/qg
+SAVEFILE = qg.qx
SOURCES = qg.ql
BASES = $(basename $(SOURCES))
@@ -14,9 +15,13 @@
all: $(PROGRAM)
$(PROGRAM): $(OBJECTS)
- $(COMPILE.qc) -L -o $(PROGRAM) $(OBJECTS)
+ @QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo $(OBJECTS)
+ @echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM)
+ @echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM)
+ @echo "export QPPATH QPLIBPATH" >>$(PROGRAM)
+ @echo -e "exec qem -L -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM)
%.qo: %.qs
- $(COMPILE.qc) -c -o $@ $<
+ @QPHOME@/src/qa -i $< -o $@
diff -ur qp8.3.orig/prolog/qp/Makefile.in qp8.3/prolog/qp/Makefile.in
--- qp8.3.orig/prolog/qp/Makefile.in 2007-12-13 15:46:22.000000000 +1300
+++ qp8.3/prolog/qp/Makefile.in 2007-12-22 19:14:09.000000000 +1300
@@ -3,6 +3,7 @@
#
PROGRAM = @QPHOME@/bin/qp
+SAVEFILE = qp.qx
SOURCES = qp.ql
BASES = $(basename $(SOURCES))
@@ -13,9 +14,13 @@
all: $(PROGRAM)
$(PROGRAM): $(OBJECTS)
- $(COMPILE.qc) -o $(PROGRAM) $(OBJECTS)
+ @QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo $(OBJECTS)
+ @echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM)
+ @echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM)
+ @echo "export QPPATH QPLIBPATH" >>$(PROGRAM)
+ @echo -e "exec qem -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM)
%.qo: %.qs
- $(COMPILE.qc) -c -o $@ $<
+ @QPHOME@/src/qa -i $< -o $@
diff -ur qp8.3.orig/src/Makefile.in qp8.3/src/Makefile.in
--- qp8.3.orig/src/Makefile.in 2007-12-13 15:46:22.000000000 +1300
+++ qp8.3/src/Makefile.in 2007-12-22 19:14:09.000000000 +1300
@@ -39,7 +39,7 @@
#export DEBUGGING=
-export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
+#export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
export QACXXFLAGS = -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
.PHONY: all
@@ -78,6 +78,9 @@
# Targets
+.cc.o:
+ $(CXX) $(CXXFLAGS) @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized -c $<
+
.PHONY: commands
commands: $(GENERATED) $(LIBRARIES) $(BIG_LIBRARY)
@$(MAKE) $(ALL_COMMANDS)
Only in qp8.3/src: io.cc.orig
Only in qp8.3/src: thread_escapes.cc.orig
Only in qp8.3/src/xqp: interact.h.orig
Only in qp8.3/src/xqp: main.cc.orig
1.1 dev-lang/qu-prolog/files/qu-prolog-8.3-configure.patch
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
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
Index: qu-prolog-8.3-configure.patch
===================================================================
--- qp8.3.orig/configure 2007-12-13 15:46:22.000000000 +1300
+++ qp8.3/configure 2007-12-22 19:10:16.000000000 +1300
@@ -3786,6 +3786,8 @@
fi
+if false; then
+
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -3836,6 +3838,7 @@
{ (exit 1); exit 1; }; }
fi
+fi
GCCINCLUDES=
--
gentoo-commits@g.o mailing list
|
