diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-07-07 01:36:08 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-07-07 01:36:08 +0200 |
| commit | 015b7087957c56f9d3322f0dfb1b8bbb4df35299 (patch) | |
| tree | 7e36a5800de34ca0e680e97b42b29f6aaf2497ba /gnulib-local/m4 | |
| parent | 407d13dddc2ecd5fef317520529f3ddff28a9213 (diff) | |
| download | guile-015b7087957c56f9d3322f0dfb1b8bbb4df35299.tar.gz | |
Work around `gl_CANONICALIZE_LGPL' bug when cross-compiling.
* gnulib-local/m4/canonicalize.m4.diff: New file.
* Makefile.am (EXTRA_DIST): Add it.
Diffstat (limited to 'gnulib-local/m4')
| -rw-r--r-- | gnulib-local/m4/canonicalize.m4.diff | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/gnulib-local/m4/canonicalize.m4.diff b/gnulib-local/m4/canonicalize.m4.diff new file mode 100644 index 000000000..5b4d06ad0 --- /dev/null +++ b/gnulib-local/m4/canonicalize.m4.diff @@ -0,0 +1,50 @@ +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 + ]) |