[gentoo-commits] gentoo-x86 commit in dev-lang/qu-prolog/files: qu-prolog-8.11-print-atom.patch qu-prolog-8.11-portage.patch

[Keri Harris (keri)]

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.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-8.11-print-atom.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-8.11-print-atom.patch?rev=1.1&content-type=text/plain

Index: qu-prolog-8.11-print-atom.patch
===================================================================
--- 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() << "\" ";
   
 #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.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-8.11-portage.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-8.11-portage.patch?rev=1.1&content-type=text/plain

Index: qu-prolog-8.11-portage.patch
===================================================================
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.
 #
 
+export QPHOME	= @prefix@/lib/qu-prolog
 export QPBIN	= @QPHOME@/bin
 
 
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=@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=""
@@ -330,18 +331,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
@@ -357,5 +347,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.11/bin: qc.in.orig
diff -ur qp8.11.orig/prolog/compiler/Makefile.in qp8.11/prolog/compiler/Makefile.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 +1200
@@ -33,5 +33,5 @@
 
 
 %.qo: %.qs
-	$(COMPILE.qc) -c -o $@ $<
+	@QPHOME@/src/qa -i $< -o $@
 
diff -ur qp8.11.orig/prolog/library/Makefile.in qp8.11/prolog/library/Makefile.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 @@
 
 
 %.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 +1200
+++ qp8.11/prolog/qc1/Makefile.in	2010-06-29 19:02:53.000000000 +1200
@@ -3,6 +3,7 @@
 #
 PROGRAM		= @QPHOME@/bin/qc1.qup
 
+SAVEFILE	= qc1.qx
 SOURCES		= qc1.ql
 
 BASES		= $(basename $(SOURCES))
@@ -13,12 +14,16 @@
 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)
 
 .PHONY:	clean
 clean:
 	$(RM) Makefile $(OBJECTS) 
 
 %.qo: %.qs
-	$(COMPILE.qc) -c -o $@ $<
+	@QPHOME@/src/qa -i $< -o $@
 
diff -ur qp8.11.orig/prolog/qecat/Makefile.in qp8.11/prolog/qecat/Makefile.in
--- qp8.11.orig/prolog/qecat/Makefile.in	2010-06-18 11:51:17.000000000 +1200
+++ qp8.11/prolog/qecat/Makefile.in	2010-06-29 19:02:53.000000000 +1200
@@ -4,6 +4,7 @@
 
 PROGRAM		= $(QPBIN)/qecat
 
+SAVEFILE	= qecat.qx
 SOURCES		= qecat.ql
 
 BASES		= $(basename $(SOURCES))
@@ -14,7 +15,11 @@
 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)
 
 .PHONY:	clean
 clean:
@@ -22,5 +27,5 @@
 
 
 %.qo: %.qs
-	$(COMPILE.qc) -c -o $@ $<
+	@QPHOME@/src/qa -i $< -o $@
 
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 @@
 
 PROGRAM		= @QPHOME@/bin/qg
 
+SAVEFILE	= qg.qx
 SOURCES		= qg.ql
 
 BASES		= $(basename $(SOURCES))
@@ -14,7 +15,11 @@
 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)
 
 .PHONY:	clean
 clean:
@@ -22,5 +27,5 @@
 
 
 %.qo: %.qs
-	$(COMPILE.qc) -c -o $@ $<
+	@QPHOME@/src/qa -i $< -o $@
 
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		= @QPHOME@/bin/qp
 
+SAVEFILE	= qp.qx
 SOURCES		= qp.ql
 
 BASES		= $(basename $(SOURCES))
@@ -13,7 +14,11 @@
 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)
 
 .PHONY:	clean
 clean:
@@ -21,5 +26,5 @@
 
 
 %.qo: %.qs
-	$(COMPILE.qc) -c -o $@ $<
+	@QPHOME@/src/qa -i $< -o $@
 
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 @@
 
 #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
@@ -79,6 +79,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)