From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1OUqMq-0000SG-Br for garchives@archives.gentoo.org; Sat, 03 Jul 2010 00:14:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6512E08AB; Sat, 3 Jul 2010 00:13:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 97351E08B1 for ; Sat, 3 Jul 2010 00:13:57 +0000 (UTC) Received: from corvid.gentoo.org (corvid.gentoo.org [208.92.234.79]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2CD521B4021 for ; Sat, 3 Jul 2010 00:13:57 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 2106) id 779202C096; Sat, 3 Jul 2010 00:13:56 +0000 (UTC) From: "Keri Harris (keri)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, keri@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/qu-prolog/files: qu-prolog-8.11-print-atom.patch qu-prolog-8.11-portage.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: qu-prolog-8.11-print-atom.patch qu-prolog-8.11-portage.patch X-VCS-Directories: dev-lang/qu-prolog/files X-VCS-Committer: keri X-VCS-Committer-Name: Keri Harris Content-Type: text/plain; charset=utf8 Message-Id: <20100703001356.779202C096@corvid.gentoo.org> Date: Sat, 3 Jul 2010 00:13:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 75bcf28b-3d13-46cd-9eca-daee27f8be47 X-Archives-Hash: a2c5db810fc9f6925f2b9403965af886 keri 10/07/03 00:13:56 Added: qu-prolog-8.11-print-atom.patch qu-prolog-8.11-portage.patch Log: Version bump (Portage version: 2.1.8.3/cvs/Linux x86_64) Revision Changes Path 1.1 dev-lang/qu-prolog/files/qu-prolog-8.11-print-atom.p= atch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/qu-prolog= /files/qu-prolog-8.11-print-atom.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/qu-prolog= /files/qu-prolog-8.11-print-atom.patch?rev=3D1.1&content-type=3Dtext/plai= n Index: qu-prolog-8.11-print-atom.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- qp8.11.orig/src/objects.h 2010-06-18 11:51:05.000000000 +1200 +++ qp8.11/src/objects.h 2010-06-29 19:04:14.000000000 +1200 @@ -1234,18 +1234,12 @@ << this->getName() << "\" "; =20 #ifndef WIN32 - switch (hasAssociatedItem()) - { - case AssociatedNone: - std::cerr << "(no info)"; - break; - case AssociatedInteger: - std::cerr << "int: " << getAssociatedInteger(); - break; - case AssociatedAtom: - std::cerr << "atom: [" << std::hex << (wordptr) getAssociatedAtom(= ) << std::dec << "]"; - break; - } + if (hasAssociatedInteger()) + std::cerr << "int: " << getAssociatedInteger(); + else if (hasAssociatedAtom()) + std::cerr << "atom: [" << std::hex << (wordptr) getAssociatedAtom() = << std::dec << "]"; + else + std::cerr << "(no info)"; #endif } #endif 1.1 dev-lang/qu-prolog/files/qu-prolog-8.11-portage.patc= h file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/qu-prolog= /files/qu-prolog-8.11-portage.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/qu-prolog= /files/qu-prolog-8.11-portage.patch?rev=3D1.1&content-type=3Dtext/plain Index: qu-prolog-8.11-portage.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff -ur qp8.11.orig/Makefile.in qp8.11/Makefile.in --- qp8.11.orig/Makefile.in 2010-06-18 11:51:17.000000000 +1200 +++ qp8.11/Makefile.in 2010-06-29 19:02:53.000000000 +1200 @@ -14,6 +14,7 @@ # objects. # =20 +export QPHOME =3D @prefix@/lib/qu-prolog export QPBIN =3D @QPHOME@/bin =20 =20 diff -ur qp8.11.orig/bin/qc.in qp8.11/bin/qc.in --- qp8.11.orig/bin/qc.in 2010-06-18 11:50:43.000000000 +1200 +++ qp8.11/bin/qc.in 2010-06-29 19:02:53.000000000 +1200 @@ -47,24 +47,25 @@ # # location of Qu-Prolog project # -PATH=3D@QPHOME@/bin:$PATH +QPHOME=3D@libdir@/qu-prolog +PATH=3D$QPHOME/bin:$PATH =20 # # names of Qu-Prolog binaries # -preprocess=3D@QPHOME@/bin/qppp -expand=3D@QPHOME@/bin/qg -compile=3D@QPHOME@/bin/qc1 +preprocess=3Dqppp +expand=3Dqg +compile=3Dqc1 compversion=3Dqup -assemble=3D@QPHOME@/bin/qa -link=3D@QPHOME@/bin/ql -execute=3D@QPHOME@/bin/qem +assemble=3Dqa +link=3Dql +execute=3Dqem =20 # # Use the line below when dynamic search for libraries is implemented. # # libqofiles=3D"" -libqofiles=3D"@QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo= " +libqofiles=3D"@QPHOME@/compiler/*.qo @QPHOME@/library/*.qo" =20 qlfiles=3D"" qlefiles=3D"" @@ -330,18 +331,7 @@ absexecfile=3D$execfile ;; *) - currdir=3D`pwd` - case $currdir in - /u*) - abspath=3D`echo $currdir | sed "s,/u./$HOSTNAME/,/homes/,"` - ;; - /tmp_mnt/*) - abspath=3D`echo $currdir | sed 's,/tmp_mnt/homes/[^/]*/,/homes/,'` - ;; - *) - abspath=3D$currdir - ;; - esac + abspath=3D`pwd` absexecfile=3D$abspath/$execfile ;; esac @@ -357,5 +347,8 @@ =20 # make executable file =20 -echo "exec $execute $Eoptions $lflag -Q '$savefile' \$* $*" >$execfile +echo "QPPATH=3D@prefix@/bin:$QPHOME/bin" >$execfile +echo "QPLIBPATH=3D$QPHOME/compiler:$QPHOME/library:"'$QPLIBPATH' >>$exec= file +echo "export QPPATH QPLIBPATH" >>$execfile +echo "exec $execute $Eoptions $lflag -Q '$savefile' \$* $*" >>$execfile chmod a+x $execfile Only in qp8.11/bin: qc.in.orig diff -ur qp8.11.orig/prolog/compiler/Makefile.in qp8.11/prolog/compiler/M= akefile.in --- qp8.11.orig/prolog/compiler/Makefile.in 2010-06-18 11:51:17.000000000= +1200 +++ qp8.11/prolog/compiler/Makefile.in 2010-06-29 19:02:53.000000000 +120= 0 @@ -33,5 +33,5 @@ =20 =20 %.qo: %.qs - $(COMPILE.qc) -c -o $@ $< + @QPHOME@/src/qa -i $< -o $@ =20 diff -ur qp8.11.orig/prolog/library/Makefile.in qp8.11/prolog/library/Mak= efile.in --- qp8.11.orig/prolog/library/Makefile.in 2010-06-18 11:51:17.000000000 = +1200 +++ qp8.11/prolog/library/Makefile.in 2010-06-29 19:02:53.000000000 +1200 @@ -104,4 +104,4 @@ =20 =20 %.qo: %.qs - $(COMPILE.qc) -c -o $@ $< + @QPHOME@/src/qa -i $< -o $@ diff -ur qp8.11.orig/prolog/qc1/Makefile.in qp8.11/prolog/qc1/Makefile.in --- qp8.11.orig/prolog/qc1/Makefile.in 2010-06-18 11:51:17.000000000 +120= 0 +++ qp8.11/prolog/qc1/Makefile.in 2010-06-29 19:02:53.000000000 +1200 @@ -3,6 +3,7 @@ # PROGRAM =3D @QPHOME@/bin/qc1.qup =20 +SAVEFILE =3D qc1.qx SOURCES =3D qc1.ql =20 BASES =3D $(basename $(SOURCES)) @@ -13,12 +14,16 @@ all: $(PROGRAM) =20 $(PROGRAM): $(OBJECTS) - $(COMPILE.qc) -L -o $(PROGRAM) $(OBJECTS) + @QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/p= rolog/library/*.qo $(OBJECTS) + @echo "QPPATH=3D@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM) + @echo "QPLIBPATH=3D$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM) + @echo "export QPPATH QPLIBPATH" >>$(PROGRAM) + @echo -e "exec qem -L -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRA= M) =20 .PHONY: clean clean: $(RM) Makefile $(OBJECTS)=20 =20 %.qo: %.qs - $(COMPILE.qc) -c -o $@ $< + @QPHOME@/src/qa -i $< -o $@ =20 diff -ur qp8.11.orig/prolog/qecat/Makefile.in qp8.11/prolog/qecat/Makefil= e.in --- qp8.11.orig/prolog/qecat/Makefile.in 2010-06-18 11:51:17.000000000 +1= 200 +++ qp8.11/prolog/qecat/Makefile.in 2010-06-29 19:02:53.000000000 +1200 @@ -4,6 +4,7 @@ =20 PROGRAM =3D $(QPBIN)/qecat =20 +SAVEFILE =3D qecat.qx SOURCES =3D qecat.ql =20 BASES =3D $(basename $(SOURCES)) @@ -14,7 +15,11 @@ all: $(PROGRAM) =20 $(PROGRAM): $(OBJECTS) - $(COMPILE.qc) -L -o $(PROGRAM) $(OBJECTS) + @QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/p= rolog/library/*.qo $(OBJECTS) + @echo "QPPATH=3D@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM) + @echo "QPLIBPATH=3D$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM) + @echo "export QPPATH QPLIBPATH" >>$(PROGRAM) + @echo -e "exec qem -L -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRA= M) =20 .PHONY: clean clean: @@ -22,5 +27,5 @@ =20 =20 %.qo: %.qs - $(COMPILE.qc) -c -o $@ $< + @QPHOME@/src/qa -i $< -o $@ =20 diff -ur qp8.11.orig/prolog/qg/Makefile.in qp8.11/prolog/qg/Makefile.in --- qp8.11.orig/prolog/qg/Makefile.in 2010-06-18 11:51:17.000000000 +1200 +++ qp8.11/prolog/qg/Makefile.in 2010-06-29 19:02:53.000000000 +1200 @@ -4,6 +4,7 @@ =20 PROGRAM =3D @QPHOME@/bin/qg =20 +SAVEFILE =3D qg.qx SOURCES =3D qg.ql =20 BASES =3D $(basename $(SOURCES)) @@ -14,7 +15,11 @@ all: $(PROGRAM) =20 $(PROGRAM): $(OBJECTS) - $(COMPILE.qc) -L -o $(PROGRAM) $(OBJECTS) + @QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/p= rolog/library/*.qo $(OBJECTS) + @echo "QPPATH=3D@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM) + @echo "QPLIBPATH=3D$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM) + @echo "export QPPATH QPLIBPATH" >>$(PROGRAM) + @echo -e "exec qem -L -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRA= M) =20 .PHONY: clean clean: @@ -22,5 +27,5 @@ =20 =20 %.qo: %.qs - $(COMPILE.qc) -c -o $@ $< + @QPHOME@/src/qa -i $< -o $@ =20 diff -ur qp8.11.orig/prolog/qp/Makefile.in qp8.11/prolog/qp/Makefile.in --- qp8.11.orig/prolog/qp/Makefile.in 2010-06-18 11:51:17.000000000 +1200 +++ qp8.11/prolog/qp/Makefile.in 2010-06-29 19:02:53.000000000 +1200 @@ -3,6 +3,7 @@ # PROGRAM =3D @QPHOME@/bin/qp =20 +SAVEFILE =3D qp.qx SOURCES =3D qp.ql =20 BASES =3D $(basename $(SOURCES)) @@ -13,7 +14,11 @@ all: $(PROGRAM) =20 $(PROGRAM): $(OBJECTS) - $(COMPILE.qc) -o $(PROGRAM) $(OBJECTS) + @QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/p= rolog/library/*.qo $(OBJECTS) + @echo "QPPATH=3D@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM) + @echo "QPLIBPATH=3D$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM) + @echo "export QPPATH QPLIBPATH" >>$(PROGRAM) + @echo -e "exec qem -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM) =20 .PHONY: clean clean: @@ -21,5 +26,5 @@ =20 =20 %.qo: %.qs - $(COMPILE.qc) -c -o $@ $< + @QPHOME@/src/qa -i $< -o $@ =20 diff -ur qp8.11.orig/src/Makefile.in qp8.11/src/Makefile.in --- qp8.11.orig/src/Makefile.in 2010-06-18 11:51:17.000000000 +1200 +++ qp8.11/src/Makefile.in 2010-06-29 19:02:53.000000000 +1200 @@ -40,7 +40,7 @@ =20 #export DEBUGGING=3D =20 -export CXXFLAGS =3D @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=3D1 $(OPTIMISAT= ION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized +#export CXXFLAGS =3D @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=3D1 $(OPTIMISA= TION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized export QACXXFLAGS =3D -Wall -D_GNU_SOURCE=3D1 @DEBUGGING@ @GCCINCLUDES@ = -Wno-uninitialized =20 .PHONY: all @@ -79,6 +79,9 @@ =20 # Targets =20 +.cc.o: + $(CXX) $(CXXFLAGS) @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=3D1 @DEBUGGING@= @GCCINCLUDES@ -Wno-uninitialized -c $< + .PHONY: commands commands: $(GENERATED) $(LIBRARIES) $(BIG_LIBRARY) @$(MAKE) $(ALL_COMMANDS)