[gentoo-commits] gentoo-x86 commit in dev-lang/qu-prolog/files: qu-prolog-9.1-cerr-ptr.patch qu-prolog-9.1-portage.patch qu-prolog-9.1-cflags.patch

[Keri Harris (keri)]

keri        11/11/19 18:20:30

  Added:                qu-prolog-9.1-cerr-ptr.patch
                        qu-prolog-9.1-portage.patch
                        qu-prolog-9.1-cflags.patch
  Log:
  Version bump
  
  (Portage version: 2.1.10.11/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-lang/qu-prolog/files/qu-prolog-9.1-cerr-ptr.patch

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

Index: qu-prolog-9.1-cerr-ptr.patch
===================================================================
diff -ur qp9.1.orig/src/gc.cc qp9.1/src/gc.cc
--- qp9.1.orig/src/gc.cc	2011-08-23 11:17:44.000000000 +1200
+++ qp9.1/src/gc.cc	2011-11-20 07:14:14.000000000 +1300
@@ -152,7 +152,7 @@
     {
       cerr << size << endl;
       heapobject* ptr = reinterpret_cast<heapobject*>(term);
-      cerr << hex << (u_int)(ptr) << " : " << *ptr << " " << *(ptr+1) << dec << endl;
+      cerr << hex << (wordptr)(ptr) << " : " << *ptr << " " << *(ptr+1) << dec << endl;
       return false;
     }
   return true;
diff -ur qp9.1.orig/src/objects.h qp9.1/src/objects.h
--- qp9.1.orig/src/objects.h	2011-08-23 11:17:44.000000000 +1200
+++ qp9.1/src/objects.h	2011-11-20 07:14:14.000000000 +1300
@@ -1242,18 +1242,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-9.1-portage.patch

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

Index: qu-prolog-9.1-portage.patch
===================================================================
diff -ur qp9.1.orig/bin/qc.in qp9.1/bin/qc.in
--- qp9.1.orig/bin/qc.in	2011-08-23 11:17:28.000000000 +1200
+++ qp9.1/bin/qc.in	2011-11-20 07:16:18.000000000 +1300
@@ -27,13 +27,13 @@
 
 ##############################
 
-preprocess='@QPHOME@/bin/qppp'
-expand='@QPHOME@/bin/qg'
-qpcompile='@QPHOME@/bin/qc1'
+preprocess='qppp'
+expand='qg'
+qpcompile='qc1'
 compversion='qup'
-assemble='@QPHOME@/bin/qa'
-link='@QPHOME@/bin/ql'
-execute='@QPHOME@/bin/qem'
+assemble='qa'
+link='ql'
+execute='qem'
 libqofiles="@QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo"
 
 ##############################
diff -ur qp9.1.orig/prolog/Makefile.in qp9.1/prolog/Makefile.in
--- qp9.1.orig/prolog/Makefile.in	2006-04-06 16:01:45.000000000 +1200
+++ qp9.1/prolog/Makefile.in	2011-11-20 07:16:18.000000000 +1300
@@ -1,3 +1,5 @@
+PATH:=$(PATH):@QPHOME@/bin
+
 .DEFAULT:
 	@$(MAKE) -C compiler	$@
 	@$(MAKE) -C library	$@



1.1                  dev-lang/qu-prolog/files/qu-prolog-9.1-cflags.patch

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

Index: qu-prolog-9.1-cflags.patch
===================================================================
--- qp9.1.orig/src/Makefile.in	2011-08-23 11:17:54.000000000 +1200
+++ qp9.1/src/Makefile.in	2011-11-20 07:15:06.000000000 +1300
@@ -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)