[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.5-229-gad4eb03

[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=ad4eb036dc02de47615dcbb392eb29109c916eaf

The branch, stable-2.0 has been updated
       via  ad4eb036dc02de47615dcbb392eb29109c916eaf (commit)
       via  015b7087957c56f9d3322f0dfb1b8bbb4df35299 (commit)
      from  407d13dddc2ecd5fef317520529f3ddff28a9213 (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 ad4eb036dc02de47615dcbb392eb29109c916eaf
Author: Ludovic Courtès <address@hidden>
Date:   Sat Jul 7 01:52:45 2012 +0200

    Work around `gl_CANONICALIZE_LGPL' bug when cross-compiling to GNU/Hurd.
    
    * gnulib-local/m4/canonicalize.m4.diff: New file.
    * Makefile.am (EXTRA_DIST): Add it.

commit 015b7087957c56f9d3322f0dfb1b8bbb4df35299
Author: Ludovic Courtès <address@hidden>
Date:   Sat Jul 7 01:36:08 2012 +0200

    Work around `gl_CANONICALIZE_LGPL' bug when cross-compiling.
    
    * gnulib-local/m4/canonicalize.m4.diff: New file.
    * Makefile.am (EXTRA_DIST): Add it.

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

Summary of changes:
 Makefile.am                          |    3 +-
 gnulib-local/m4/canonicalize.m4.diff |   67 ++++++++++++++++++++++++++++++++++
 m4/canonicalize.m4                   |   28 ++++++++++----
 3 files changed, 89 insertions(+), 9 deletions(-)
 create mode 100644 gnulib-local/m4/canonicalize.m4.diff

diff --git a/Makefile.am b/Makefile.am
index a8e30c6..807e0a8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,7 +49,8 @@ EXTRA_DIST = LICENSE HACKING GUILE-VERSION            \
             .version                                   \
             gnulib-local/lib/localcharset.h.diff       \
             gnulib-local/lib/localcharset.c.diff       \
-            gnulib-local/m4/clock_time.m4.diff
+            gnulib-local/m4/clock_time.m4.diff         \
+            gnulib-local/m4/canonicalize.m4.diff
 
 TESTS = check-guile
 TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
diff --git a/gnulib-local/m4/canonicalize.m4.diff 
b/gnulib-local/m4/canonicalize.m4.diff
new file mode 100644
index 0000000..57f4472
--- /dev/null
+++ b/gnulib-local/m4/canonicalize.m4.diff
@@ -0,0 +1,67 @@
+Fix `canonicalize_file_name' replacement handling when cross-compiling.
+Without this patch, we end up with:
+
+  ./.libs/libguile-2.0.so: undefined reference to `rpl_canonicalize_file_name'
+
+See <http://hydra.nixos.org/build/2765567> for details.
+
+index 69b3f4c..3c4c5ee 100644
+--- a/m4/canonicalize.m4
++++ b/m4/canonicalize.m4
+@@ -16,8 +16,11 @@ AC_DEFUN([gl_FUNC_CANONICALIZE_FILENAME_MODE],
+   AC_REQUIRE([gl_FUNC_REALPATH_WORKS])
+   if test $ac_cv_func_canonicalize_file_name = no; then
+     HAVE_CANONICALIZE_FILE_NAME=0
+-  elif test "$gl_cv_func_realpath_works" != yes; then
+-    REPLACE_CANONICALIZE_FILE_NAME=1
++  else
++    case "$gl_cv_func_realpath_works" in
++      *yes) ;;
++      *)    REPLACE_CANONICALIZE_FILE_NAME=1 ;;
++    esac
+   fi
+ ])
+ 
+@@ -30,12 +33,21 @@ AC_DEFUN([gl_CANONICALIZE_LGPL],
+     HAVE_CANONICALIZE_FILE_NAME=0
+     if test $ac_cv_func_realpath = no; then
+       HAVE_REALPATH=0
+-    elif test "$gl_cv_func_realpath_works" != yes; then
+-      REPLACE_REALPATH=1
++    else
++      case "$gl_cv_func_realpath_works" in
++      *yes) ;;
++      *)    REPLACE_REALPATH=1 ;;
++      esac
+     fi
+-  elif test "$gl_cv_func_realpath_works" != yes; then
+-    REPLACE_CANONICALIZE_FILE_NAME=1
+-    REPLACE_REALPATH=1
++  else
++    case "$gl_cv_func_realpath_works" in
++      *yes)
++        ;;
++      *)
++        REPLACE_CANONICALIZE_FILE_NAME=1
++        REPLACE_REALPATH=1
++        ;;
++    esac
+   fi
+ ])
+
+
+Now, work around a second bug: fix default value when cross-compiling
+for GNU/Hurd.
+
+index 69b3f4c..111ddf8 100644
+--- a/m4/canonicalize.m4
++++ b/m4/canonicalize.m4
+@@ -95,7 +95,7 @@ AC_DEFUN([gl_FUNC_REALPATH_WORKS],
+      [gl_cv_func_realpath_works=no],
+      [case "$host_os" in
+                 # Guess yes on glibc systems.
+-        *-gnu*) gl_cv_func_realpath_works="guessing yes" ;;
++        *gnu*)  gl_cv_func_realpath_works="guessing yes" ;;
+                 # If we don't know, assume the worst.
+         *)      gl_cv_func_realpath_works="guessing no" ;;
+       esac
diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4
index 69b3f4c..37df6fc 100644
--- a/m4/canonicalize.m4
+++ b/m4/canonicalize.m4
@@ -16,8 +16,11 @@ AC_DEFUN([gl_FUNC_CANONICALIZE_FILENAME_MODE],
   AC_REQUIRE([gl_FUNC_REALPATH_WORKS])
   if test $ac_cv_func_canonicalize_file_name = no; then
     HAVE_CANONICALIZE_FILE_NAME=0
-  elif test "$gl_cv_func_realpath_works" != yes; then
-    REPLACE_CANONICALIZE_FILE_NAME=1
+  else
+    case "$gl_cv_func_realpath_works" in
+      *yes) ;;
+      *)    REPLACE_CANONICALIZE_FILE_NAME=1 ;;
+    esac
   fi
 ])
 
@@ -30,12 +33,21 @@ AC_DEFUN([gl_CANONICALIZE_LGPL],
     HAVE_CANONICALIZE_FILE_NAME=0
     if test $ac_cv_func_realpath = no; then
       HAVE_REALPATH=0
-    elif test "$gl_cv_func_realpath_works" != yes; then
-      REPLACE_REALPATH=1
+    else
+      case "$gl_cv_func_realpath_works" in
+       *yes) ;;
+       *)    REPLACE_REALPATH=1 ;;
+      esac
     fi
-  elif test "$gl_cv_func_realpath_works" != yes; then
-    REPLACE_CANONICALIZE_FILE_NAME=1
-    REPLACE_REALPATH=1
+  else
+    case "$gl_cv_func_realpath_works" in
+      *yes)
+        ;;
+      *)
+        REPLACE_CANONICALIZE_FILE_NAME=1
+        REPLACE_REALPATH=1
+        ;;
+    esac
   fi
 ])
 
@@ -95,7 +107,7 @@ AC_DEFUN([gl_FUNC_REALPATH_WORKS],
      [gl_cv_func_realpath_works=no],
      [case "$host_os" in
                 # Guess yes on glibc systems.
-        *-gnu*) gl_cv_func_realpath_works="guessing yes" ;;
+        *gnu*)  gl_cv_func_realpath_works="guessing yes" ;;
                 # If we don't know, assume the worst.
         *)      gl_cv_func_realpath_works="guessing no" ;;
       esac


hooks/post-receive
-- 
GNU Guile