mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-30 06:50:31 +02:00
Code Activity

Work around `gl_CANONICALIZE_LGPL' bug when cross-compiling.

Browse source 
* gnulib-local/m4/canonicalize.m4.diff: New file.
* Makefile.am (EXTRA_DIST): Add it.
This commit is contained in:
Ludovic Courtès 2012-07-07 01:36:08 +02:00
parent 407d13dddc
commit 015b708795
3 changed files with 71 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Makefile.am
View file

@ -49,7 +49,8 @@ EXTRA_DIST = LICENSE HACKING GUILE-VERSION \
.version \ .version \
gnulib-local/lib/localcharset.h.diff \ gnulib-local/lib/localcharset.h.diff \
gnulib-local/lib/localcharset.c.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 = check-guile
TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@

50
gnulib-local/m4/canonicalize.m4.diff Normal file
View file

@ -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
])

22
m4/canonicalize.m4
View file

@ -16,8 +16,11 @@ AC_DEFUN([gl_FUNC_CANONICALIZE_FILENAME_MODE],
AC_REQUIRE([gl_FUNC_REALPATH_WORKS]) AC_REQUIRE([gl_FUNC_REALPATH_WORKS])
if test $ac_cv_func_canonicalize_file_name = no; then if test $ac_cv_func_canonicalize_file_name = no; then
HAVE_CANONICALIZE_FILE_NAME=0 HAVE_CANONICALIZE_FILE_NAME=0
elif test "$gl_cv_func_realpath_works" != yes; then else
REPLACE_CANONICALIZE_FILE_NAME=1 case "$gl_cv_func_realpath_works" in
*yes) ;;
*) REPLACE_CANONICALIZE_FILE_NAME=1 ;;
esac
fi fi
]) ])
@ -30,12 +33,21 @@ AC_DEFUN([gl_CANONICALIZE_LGPL],
HAVE_CANONICALIZE_FILE_NAME=0 HAVE_CANONICALIZE_FILE_NAME=0
if test $ac_cv_func_realpath = no; then if test $ac_cv_func_realpath = no; then
HAVE_REALPATH=0 HAVE_REALPATH=0
elif test "$gl_cv_func_realpath_works" != yes; then else
REPLACE_REALPATH=1 case "$gl_cv_func_realpath_works" in
*yes) ;;
*) REPLACE_REALPATH=1 ;;
esac
fi fi
elif test "$gl_cv_func_realpath_works" != yes; then else
case "$gl_cv_func_realpath_works" in
*yes)
;;
*)
REPLACE_CANONICALIZE_FILE_NAME=1 REPLACE_CANONICALIZE_FILE_NAME=1
REPLACE_REALPATH=1 REPLACE_REALPATH=1
;;
esac
fi fi
]) ])