[Guile-commits] GNU Guile branch, master, updated. release_1-9-5-3-g91cbeff

[Ludovic Courtès]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=91cbeffc871327ee0fee4a4acf27969188529f77

The branch, master has been updated
       via  91cbeffc871327ee0fee4a4acf27969188529f77 (commit)
       via  0c1eb9b68c7759383340c3f91517c7f7a87fc559 (commit)
      from  53da7372beca90a58b7401a84627815289a53d11 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 91cbeffc871327ee0fee4a4acf27969188529f77
Author: Ludovic Courtès <address@hidden>
Date:   Wed Nov 18 15:28:56 2009 +0100

    Work around path name length limitations in `socket.test'.
    
    * test-suite/tests/socket.test (%tmpdir, %curdir): New variables.
      Chdir to %TMPDIR.  Switch back to %CURDIR at the end.
      (temp-file-path): Return a base file name, not an absolute path.

commit 0c1eb9b68c7759383340c3f91517c7f7a87fc559
Author: Ludovic Courtès <address@hidden>
Date:   Wed Nov 18 14:59:33 2009 +0100

    Remove conflicting definition of $PACKAGE from `GUILE-VERSION'.
    
    This obviates the need for the previous commit,
    53da7372beca90a58b7401a84627815289a53d11.
    
    * GUILE-VERSION (VERSION, PACKAGE): Remove.  The latter was conflicting
      with Automake's definition, which is "guile", not "GNU Guile".
    
    * Makefile.am (distdir): Remove.
    
    * configure.ac: Hardcode the package name passed to `AC_INIT'.
      (pkgdatadir, pkgincludedir, pkglibdir, pkglibexecdir): Remove.

-----------------------------------------------------------------------

Summary of changes:
 GUILE-VERSION                |    4 ----
 Makefile.am                  |    4 ----
 configure.ac                 |   16 ++--------------
 test-suite/tests/socket.test |   34 ++++++++++++++++++++++++++--------
 4 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/GUILE-VERSION b/GUILE-VERSION
index 4f6a9af..ea6cdda 100644
--- a/GUILE-VERSION
+++ b/GUILE-VERSION
@@ -7,10 +7,6 @@ GUILE_MICRO_VERSION=5
 GUILE_EFFECTIVE_VERSION=${GUILE_MAJOR_VERSION}.${GUILE_MINOR_VERSION}
 GUILE_VERSION=${GUILE_EFFECTIVE_VERSION}.${GUILE_MICRO_VERSION}
 
-# For automake.
-VERSION=${GUILE_VERSION}
-PACKAGE="GNU Guile"
-
 # All of the shared lib versioning info.  Right now, for this to work
 # properly, you'll also need to add AC_SUBST calls to the right place
 # in configure.in, add the right -version-info statement to your
diff --git a/Makefile.am b/Makefile.am
index 1ee3e80..06c5b38 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,10 +40,6 @@ ACLOCAL_AMFLAGS = -I m4
 
 DISTCLEANFILES = check-guile.log
 
-# Help Automake choose the right directory name (Automake 1.11 uses
-# `$(PACKAGE)-$(PACKAGE_VERSION)' by default, which is wrong.)
-distdir = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
-
 DISTCHECK_CONFIGURE_FLAGS = --enable-error-on-warning
 
 dist-hook: gen-ChangeLog
diff --git a/configure.ac b/configure.ac
index 65ba073..fc9479d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,8 +32,7 @@ dnl  "echo -n" since -n is not portable (see autoconf manual 
"Limitations of
 dnl  Builtins"), in particular on solaris it results in a literal "-n" in
 dnl  the output.
 dnl
-AC_INIT(patsubst(m4_esyscmd(. ./GUILE-VERSION && echo ${PACKAGE}),[
-]),
+AC_INIT([GNU Guile],
         patsubst(m4_esyscmd(. ./GUILE-VERSION && echo ${GUILE_VERSION}),[
 ]),
         address@hidden)
@@ -1544,20 +1543,9 @@ AC_SUBST(top_builddir_absolute)
 top_srcdir_absolute=`(cd $srcdir && pwd)`
 AC_SUBST(top_srcdir_absolute)
 
-dnl Override Automake 1.11's broken definitions.
-dnl See http://thread.gmane.org/gmane.comp.sysutils.automake.bugs/4803
-dnl and info "(automake) Uniform" and info "(autoconf) Initializing configure".
-pkgdatadir="$datadir/$PACKAGE_TARNAME"
-pkgincludedir="$includedir/$PACKAGE_TARNAME"
-pkglibdir="$libdir/$PACKAGE_TARNAME"
-pkglibexecdir="$libexecdir/$PACKAGE_TARNAME"
-AC_SUBST([pkgdatadir])
-AC_SUBST([pkgincludedir])
-AC_SUBST([pkglibdir])
-AC_SUBST([pkglibexecdir])
-
 dnl We need `sitedir' in `guile-1.8.pc'.
 dnl Note: `sitedir' must be kept in sync with `GUILE_SITE_DIR' in `guile.m4'.
+pkgdatadir="$datadir/$PACKAGE_TARNAME"
 sitedir="$pkgdatadir/site"
 AC_SUBST([sitedir])
 
diff --git a/test-suite/tests/socket.test b/test-suite/tests/socket.test
index 8fccc36..cc512bf 100644
--- a/test-suite/tests/socket.test
+++ b/test-suite/tests/socket.test
@@ -1,6 +1,6 @@
 ;;;; socket.test --- test socket functions     -*- scheme -*-
 ;;;;
-;;;; Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software 
Foundation, Inc.
 ;;;;
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
@@ -174,13 +174,28 @@
 ;;; AF_UNIX sockets and `make-socket-address'
 ;;;
 
+(define %tmpdir
+  ;; Honor `$TMPDIR', which tmpnam(3) doesn't do.
+  (or (getenv "TMPDIR") "/tmp"))
+
+(define %curdir
+  ;; Remember the current working directory.
+  (getcwd))
+
+;; Temporarily cd to %TMPDIR.  The goal is to work around path name
+;; limitations, which can lead to exceptions like:
+;;
+;;  (misc-error "scm_to_sockaddr"
+;;              "unix address path too long: ~A"
+;;              
("/tmp/nix-build-fb7bph4ifh0vr3ihigm702dzffdnapfj-guile-coverage-1.9.5.drv-0/guile-test-socket-1258553296-77619")
+;;              #f)
+(chdir %tmpdir)
+
 (define (temp-file-path)
-  ;; Return a temporary file path that honors `$TMPDIR', which `tmpnam'
-  ;; doesn't do.
-  (let ((dir (or (getenv "TMPDIR") "/tmp")))
-    (string-append dir "/guile-test-socket-"
-                   (number->string (current-time)) "-"
-                   (number->string (random 100000)))))
+  ;; Return a temporary file name, assuming the current directory is %TMPDIR.
+  (string-append "guile-test-socket-"
+                 (number->string (current-time)) "-"
+                 (number->string (random 100000))))
 
 
 (if (defined? 'AF_UNIX)
@@ -408,4 +423,7 @@
              (let ((status (cdr (waitpid server-pid))))
                (eq? 0 (status:exit-val status)))))
 
-       #t)))
\ No newline at end of file
+       #t)))
+
+;; Switch back to the previous directory.
+(false-if-exception (chdir %curdir))


hooks/post-receive
-- 
GNU Guile