<short summary of the patch>

Bug-Debian: https://bugs.debian.org/811523

TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.

gcl (2.6.12-32) unstable; urgency=medium

  * Version_2_6_13pre40
  * Bug fix: "[INTL:pt_BR] Brazilian Portuguese debconf templates
    translation", thanks to Adriano Rafael Gomes (Closes: #811523).

Gbp-Pq: Name Version_2_6_13pre41

diff --git a/h/notcomp.h b/h/notcomp.h
index 71e8018960aaa759396942cdb86ea992eedcb5bc..65435e10ecd23c5ee01f2ba87e92881ef3528453 100755 (executable)
--- a/h/notcomp.h
+++ b/h/notcomp.h
@@ -300,7 +300,8 @@ gcl_init_cmp_anon(void);
 
 #include "gmp_wrappers.h"
 
-#define massert(a_) if (!(a_)) assert_error(#a_,__LINE__,__FILE__,__FUNCTION__)
+#include <errno.h>
+#define massert(a_) ({errno=0;if (!(a_)||errno) assert_error(#a_,__LINE__,__FILE__,__FUNCTION__);})
 
 extern bool writable_malloc;
 #define writable_malloc_wrap(f_,rt_,a_...) ({rt_ v;bool w=writable_malloc;writable_malloc=1;v=f_(a_);writable_malloc=w;v;})

diff --git a/lsp/gcl_mislib.lsp b/lsp/gcl_mislib.lsp
index 08e2e05a942f7f5a8a9c8baa766e634df0ed10a7..aaa69962d4c8cab0f476b6e28e5309ead7d2b7a1 100755 (executable)
--- a/lsp/gcl_mislib.lsp
+++ b/lsp/gcl_mislib.lsp
@@ -131,7 +131,7 @@ x))
            *gcl-major-version* *gcl-minor-version* *gcl-extra-version*
            (if (member :ansi-cl *features*) "ANSI" "CLtL1")
            (if (member :gprof *features*) "profiling" "")
-           (gcl-compile-time)
+           *gcl-release-date*
            "Source License: LGPL(gcl,gmp), GPL(unexec,bfd,xgcl)"
            "Binary License: "
            (if gpled-modules (format nil "GPL due to GPL'ed components: ~a" gpled-modules)

diff --git a/lsp/gcl_predlib.lsp b/lsp/gcl_predlib.lsp
index 106089030e83cb10dfc942c996c95f22c95f3879..0da83b157a43bbff518b4d02e1cd322f221caf6d 100755 (executable)
--- a/lsp/gcl_predlib.lsp
+++ b/lsp/gcl_predlib.lsp
@@ -777,6 +777,7 @@
 (defvar *gcl-extra-version* nil)
 (defvar *gcl-minor-version* nil)
 (defvar *gcl-major-version* nil)
+(defvar *gcl-release-date*  nil)
 
 (defun warn-version (majvers minvers extvers)
   (and *gcl-major-version* *gcl-minor-version* *gcl-extra-version*

diff --git a/makefile b/makefile
index 69bfb9fa18f2c83a4b4d71140e8d9fafe10eb76c..9d34f5d2a7755c404f630e099d2a76604eac2c6d 100644 (file)
--- a/makefile
+++ b/makefile
@@ -34,9 +34,9 @@ TESTDIR = ansi-tests
 
 VERSION=`cat majvers`.`cat minvers`
 
-all: $(BUILD_BFD) system command cmpnew/gcl_collectfn.o lsp/gcl_info.o do-gcl-tk # do-info
+all: $(BUILD_BFD) system command cmpnew/gcl_collectfn.o lsp/gcl_info.o do-gcl-tk release # do-info
 
-ASRC:=$(shell ls -1 o/*.c lsp/*.lsp cmpnew/*.lsp mod/*.lsp pcl/*sp clcs/*sp xgcl-2/*p) #o/*.d o/*.h h/*.h
+ASRC:=$(shell ls -1 o/*.c lsp/*.lsp cmpnew/*.lsp pcl/*sp clcs/*sp xgcl-2/*p) #o/*.d o/*.h h/*.h
 TAGS: $(ASRC)
        etags --regex='/\#.`(defun[ \n\t]+\([^ \n\t]+\)/' $^
 
@@ -44,6 +44,9 @@ system: $(PORTDIR)/$(FLISP)
 #      [ "$(X_LIBS)" == "" ] || (cd xgcl-2 && make saved_xgcl LISP=../$< && mv saved_xgcl ../$(PORTDIR)/$(FLISP))
        touch $@
 
+release: majvers minvers
+       date >$@
+
 xgcl: $(PORTDIR)/saved_xgcl
 
 $(PORTDIR)/saved_xgcl: $(PORTDIR)/saved_gcl

diff --git a/o/error.c b/o/error.c
index a3b78c8531752ac401c6e2662129bc44d9705309..3d20c12bf8e93b4c25d1a045b18d53d9b3817997 100755 (executable)
--- a/o/error.c
+++ b/o/error.c
@@ -27,6 +27,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
 #include <stdlib.h>
+#include <string.h>
 #include "include.h"
 object siSuniversal_error_handler;
 
@@ -36,11 +37,11 @@ void
 assert_error(const char *a,unsigned l,const char *f,const char *n) {
 
   if (!raw_image && core_end && core_end==sbrk(0))
-    FEerror("The assertion ~a on line ~a of ~a in function ~a failed",4,
+    FEerror("The assertion ~a on line ~a of ~a in function ~a failed: ~a",5,
            make_simple_string(a),make_fixnum(l),
-           make_simple_string(f),make_simple_string(n));
+           make_simple_string(f),make_simple_string(n),make_simple_string(strerror(errno)));
   else {
-    emsg("The assertion %s on line %d of %s in function %s failed",a,l,f,n);
+    emsg("The assertion %s on line %d of %s in function %s failed: %s",a,l,f,n,strerror(errno));
     do_gcl_abort();
   }
 

diff --git a/o/main.c b/o/main.c
index 203c40a237f4cbc4bf55e8da9fb374eb3dbbb2ea..8c3d37cd536f35117c73aec180349a242ad2c665 100755 (executable)
--- a/o/main.c
+++ b/o/main.c
@@ -242,7 +242,7 @@ get_gc_environ(void) {
   }
 
   gc_page_min=0.5;
-  if ((e=getenv("GCL_GC_PAGE_THRESH"))) {
+  if ((e=getenv("GCL_GC_PAGE_MIN"))) {
     massert(sscanf(e,"%lf",&gc_page_min)==1);
     massert(gc_page_min>=0.0);
   }
@@ -1028,12 +1028,6 @@ DEFUNO_NEW("IDENTITY",object,fLidentity,LISP
   RETURN1 (x0);
 }
 
-DEFUNO_NEW("GCL-COMPILE-TIME",object,fSgcl_compile_time,SI
-       ,0,0,NONE,OO,OO,OO,OO,void,Lgcl_compile_time,(void),"")
-{
-  RETURN1 (make_simple_string(__DATE__ " " __TIME__));
-}
-
 DEFUNO_NEW("LDB1",object,fSldb1,SI
        ,3,3,NONE,OI,II,OO,OO,void,Lldb1,(fixnum a,fixnum b, fixnum c),"")
 {

diff --git a/o/sfasli.c b/o/sfasli.c
index 5e0f5970efe7351b2e70c15817400a04822a5fc3..c7b23bc0b262e7442ad865b2fb4bc7c48a9a7910 100755 (executable)
--- a/o/sfasli.c
+++ b/o/sfasli.c
@@ -115,10 +115,9 @@ LFD(build_symbol_table)(void) {
 int
 use_symbols(double d,...) {
 
+  double d2;
 #ifndef DARWIN
-
   extern void sincos(double,double *,double *);
-  double d2;
 
   sincos(d,&d,&d2);
 

diff --git a/release b/release
new file mode 100644 (file)
index 0000000..5b75dc6
--- /dev/null
+++ b/release
@@ -0,0 +1 @@
+Fri Apr 22 15:51:11 UTC 2016

diff --git a/unixport/makefile b/unixport/makefile
index 9561e767620f8f1e3599d8bdbe7e23d2312e8077..15b3a2945b1a3ec0ba14c02b5dd3815a919115cc 100644 (file)
--- a/unixport/makefile
+++ b/unixport/makefile
@@ -72,10 +72,11 @@ $(LSPDIR)/auto_new.lsp: $(LSPDIR)/auto.lsp
 sys_init.lsp: sys_init.lsp.in
 
        cat $< | sed \
-               -e "s#@LI-VERS@#(`cat ../majvers`.`cat ../minvers`) `date`#1" \
+               -e "s#@LI-VERS@#(`cat ../majvers`.`cat ../minvers`) `cat ../release`#1" \
                -e "s#@LI-EXTVERS@#`cat ../minvers | cut -f2 -d.`#1" \
                -e "s#@LI-MINVERS@#`cat ../minvers | cut -f1 -d.`#1" \
                -e "s#@LI-MAJVERS@#`cat ../majvers`#1" \
+               -e "s#@LI-RELEASE@#`cat ../release`#1" \
                -e "s#@LI-CC@#\"$(CC) -c $(FINAL_CFLAGS)\"#1" \
                -e "s#@LI-LD@#\"$(CC) $(LD_FLAGS) -o \"#1" \
                -e "s#@LI-LD-LIBS@#\" $(LD_LIBS_PRE) -l$* $(LD_LIBS_POST)\"#1" \

diff --git a/unixport/sys_init.lsp.in b/unixport/sys_init.lsp.in
index 0bd8cf91863add52d6dfaeb4bd5bf92fbb87ec02..8f13c916a0ebfe11a3d318c4fa4df568e9fca176 100644 (file)
--- a/unixport/sys_init.lsp.in
+++ b/unixport/sys_init.lsp.in
@@ -51,7 +51,8 @@
 
 (setq *gcl-extra-version* @LI-EXTVERS@
       *gcl-minor-version* @LI-MINVERS@ 
-      *gcl-major-version* @LI-MAJVERS@)
+      *gcl-major-version* @LI-MAJVERS@
+      *gcl-release-date*  "@LI-RELEASE@")
 
 (defvar *system-banner* (default-system-banner))
 (setq *optimize-maximum-pages* t)
@@ -83,3 +84,5 @@
 (let* ((i 4096)(j (si::equal-tail-recursion-check i)))
   (unless (<= (ash i -1) j)
     (warn "equal is not tail recursive ~s ~s" i j)))
+
+(format t "~s heap words available~%" (multiple-value-bind (a b c d) (si::heap-report) (/ (- d c) (/ a 8))))