Re: Please put these fixes from CVS HEAD into branch_release-1-6

[Matthias Koeppe]

Rob Browning <address@hidden> wrote on Nov 5, 2003:

> Matthias Koeppe <address@hidden> writes:
>
>> Earlier this year, I reported a build problem of Guile on Solaris
>> when using the Sun/Forte compiler.  The fix was put only put into
>> CVS HEAD:
>
> If no one gets to this beforehand, I'll do it next week.

I have just noticed that the changes still do not show up in CVS.
Could someone please put my fixes into the stable branch?  Thanks.

For reference, I am attaching my message again below.

-------------------->8--------------------

Earlier this year, I reported a build problem of Guile on Solaris
when using the Sun/Forte compiler.  The fix was put only put into CVS
HEAD: 

2003-07-27  Marius Vollmer  <address@hidden>

        * configure.in (__libc_stack_end): Actually use the value in
        __libc_stack_end for something so that the access doesn't get
        optimized away.  Thanks to Matthias Koeppe!

Today I tried to build a Guile from branch_release-1-6 and ran into
the same old problem.  Can you please put this fix into the stable
branch?  Thank you.

--- configure.in.~1.157.2.26.~  Tue Nov  4 14:23:03 2003
+++ configure.in        Tue Nov  4 18:44:37 2003
@@ -325,8 +325,9 @@
               inet_pton inet_ntop)

 AC_MSG_CHECKING(for __libc_stack_end)
-AC_TRY_LINK([extern char *__libc_stack_end;],
-            [char *p = __libc_stack_end;],
+AC_TRY_LINK([#include <stdio.h>
+extern char *__libc_stack_end;],
+             [printf("%p", (char*) __libc_stack_end);],
             have_libc_stack_end=yes,
             have_libc_stack_end=no)
 AC_MSG_RESULT($have_libc_stack_end)

The same, though less critical, applies to this fix:

2003-02-27  Matthias Koeppe  <address@hidden>

        * format.scm (format:out-substr): Update the column counter
        correctly. This fixes the behavior of ~T (tabbing) after ~F, for
        instance. 

Index: ice-9/format.scm
===================================================================
RCS file: /cvs/guile/guile-core/ice-9/format.scm,v
retrieving revision 1.11.2.1
diff -u -r1.11.2.1 format.scm
--- ice-9/format.scm    27 Nov 2001 22:30:04 -0000      1.11.2.1
+++ ice-9/format.scm    4 Nov 2003 17:50:42 -0000
@@ -94,7 +94,7 @@
   (do ((k i (+ k 1)))
       ((= k n))
     (write-char (string-ref str k) format:port))
-  (set! format:output-col (+ format:output-col n)))
+  (set! format:output-col (+ format:output-col (- n i))))

 ;(define (format:out-fill n ch)       ; this allocates a new string
 ;  (format:out-str (make-string n ch)))

-- 
Matthias Koeppe -- http://www.math.uni-magdeburg.de/~mkoeppe