Hi,
Ørjan Malde wrote:
> from running the testsuite:
> PASS: test-nanosleep
> PASS: test-ftruncate.sh
> PASS: test-utime
> PASS: test-utimens
> PASS: test-utimensat
> PASS: test-rename
OK...
> @@ -119,6 +119,9 @@ AC_DEFUN([gl_FUNC_NANOSLEEP],
> # Guess it halfway works when the kernel is Linux.
> linux*)
> gl_cv_func_nanosleep='guessing no (mishandles large arguments)'
> ;;
> + # Guess yes on systems that emulate the Linux system calls.
> + midipix*)
> + gl_cv_func_nanosleep'guessing yes' ;;
If on Linux, the result is 'guessing no (mishandles large arguments)',
it should be the same on systems that emulate the Linux system calls. Right?
More generally, it's probably useful to have
linux* | midipix*
in the same 'case' clause, for consistency.
Also, there is a shell syntax error in the last line.
I am therefore applying this modified patch:
2024-02-05 Bruno Haible <br...@clisp.org>
Further improve cross-compilation for midipix.
Based on patch by Ørjan Malde <r...@foxi.me> from
<https://lists.gnu.org/archive/html/bug-gnulib/2024-02/msg00004.html>.
* m4/nanosleep.m4 (gl_FUNC_NANOSLEEP): Add cross-compilation guess for
midipix.
* m4/rename.m4 (gl_FUNC_RENAME): Likewise.
* m4/truncate.m4 (gl_FUNC_TRUNCATE): Likewise.
* m4/utime.m4 (gl_FUNC_UTIME): Likewise.
* m4/utimens.m4 (gl_UTIMENS): Likewise.
* m4/utimensat.m4 (gl_FUNC_UTIMENSAT): Likewise.
diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4
index c51f590402..38c0a5e71f 100644
--- a/m4/nanosleep.m4
+++ b/m4/nanosleep.m4
@@ -1,4 +1,4 @@
-# serial 46
+# serial 47
dnl From Jim Meyering.
dnl Check for the nanosleep function.
@@ -116,8 +116,9 @@ AC_DEFUN([gl_FUNC_NANOSLEEP]
*) gl_cv_func_nanosleep=no ;;
esac],
[case "$host_os" in
- # Guess it halfway works when the kernel is Linux.
- linux*)
+ # Guess it halfway works when the kernel is Linux
+ # and on systems that emulate the Linux system calls.
+ linux* | midipix*)
gl_cv_func_nanosleep='guessing no (mishandles large arguments)' ;;
# Guess no on native Windows.
mingw* | windows*)
diff --git a/m4/rename.m4 b/m4/rename.m4
index 5383b3ea52..757cc27b2a 100644
--- a/m4/rename.m4
+++ b/m4/rename.m4
@@ -1,4 +1,4 @@
-# serial 36
+# serial 37
# Copyright (C) 2001, 2003, 2005-2006, 2009-2024 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
@@ -55,10 +55,9 @@ AC_DEFUN([gl_FUNC_RENAME]
[gl_cv_func_rename_slash_dst_works=no],
dnl When crosscompiling, assume rename is broken.
[case "$host_os" in
- # Guess yes on Linux systems.
- linux-* | linux) gl_cv_func_rename_slash_dst_works="guessing yes" ;;
- # Guess yes on systems that emulate the Linux
system calls.
- midipix*) gl_cv_func_rename_slash_dst_works="guessing yes" ;;
+ # Guess yes on Linux systems
+ # and on systems that emulate the Linux system
calls.
+ linux* | midipix*) gl_cv_func_rename_slash_dst_works="guessing yes" ;;
# Guess yes on glibc systems.
*-gnu*) gl_cv_func_rename_slash_dst_works="guessing yes" ;;
# Guess no on native Windows.
@@ -113,10 +112,9 @@ AC_DEFUN([gl_FUNC_RENAME]
[gl_cv_func_rename_slash_src_works=no],
dnl When crosscompiling, assume rename is broken.
[case "$host_os" in
- # Guess yes on Linux systems.
- linux-* | linux) gl_cv_func_rename_slash_src_works="guessing yes" ;;
- # Guess yes on systems that emulate the Linux
system calls.
- midipix*) gl_cv_func_rename_slash_src_works="guessing yes" ;;
+ # Guess yes on Linux systems
+ # and on systems that emulate the Linux system
calls.
+ linux* | midipix*) gl_cv_func_rename_slash_src_works="guessing yes" ;;
# Guess yes on glibc systems.
*-gnu*) gl_cv_func_rename_slash_src_works="guessing yes" ;;
# Guess yes on native Windows.
@@ -186,10 +184,9 @@ AC_DEFUN([gl_FUNC_RENAME]
else
dnl When crosscompiling, assume rename is broken.
case "$host_os" in
- # Guess yes on Linux systems.
- linux-* | linux) gl_cv_func_rename_link_works="guessing yes" ;;
- # Guess yes on systems that emulate the Linux
system calls.
- midipix*) gl_cv_func_rename_link_works="guessing yes" ;;
+ # Guess yes on Linux systems
+ # and on systems that emulate the Linux system
calls.
+ linux* | midipix*) gl_cv_func_rename_link_works="guessing yes" ;;
# Guess yes on glibc systems.
*-gnu*) gl_cv_func_rename_link_works="guessing yes" ;;
# Guess yes on native Windows.
@@ -237,8 +234,9 @@ AC_DEFUN([gl_FUNC_RENAME]
[gl_cv_func_rename_dest_works=no],
dnl When crosscompiling, assume rename is broken.
[case "$host_os" in
- # Guess yes on Linux systems.
- linux-* | linux) gl_cv_func_rename_dest_works="guessing yes" ;;
+ # Guess yes on Linux systems
+ # and on systems that emulate the Linux system
calls.
+ linux* | midipix*) gl_cv_func_rename_dest_works="guessing yes" ;;
# Guess yes on glibc systems.
*-gnu*) gl_cv_func_rename_dest_works="guessing yes" ;;
# Guess no on native Windows.
diff --git a/m4/truncate.m4 b/m4/truncate.m4
index 727832224a..2abc9aea74 100644
--- a/m4/truncate.m4
+++ b/m4/truncate.m4
@@ -1,4 +1,4 @@
-# truncate.m4 serial 6 -*- Autoconf -*-
+# truncate.m4 serial 7 -*- Autoconf -*-
dnl Copyright (C) 2017-2024 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -48,14 +48,15 @@ AC_DEFUN([gl_FUNC_TRUNCATE]
[gl_cv_func_truncate_works=yes],
[gl_cv_func_truncate_works=no],
[case "$host_os" in
- # Guess yes on Linux systems.
- linux-* | linux) gl_cv_func_truncate_works="guessing yes" ;;
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_truncate_works="guessing yes" ;;
- # Guess no on AIX systems.
- aix*) gl_cv_func_truncate_works="guessing no" ;;
- # If we don't know, obey --enable-cross-guesses.
- *)
gl_cv_func_truncate_works="$gl_cross_guess_normal" ;;
+ # Guess yes on Linux systems
+ # and on systems that emulate the Linux
system calls.
+ linux* | midipix*) gl_cv_func_truncate_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_truncate_works="guessing yes" ;;
+ # Guess no on AIX systems.
+ aix*) gl_cv_func_truncate_works="guessing no" ;;
+ # If we don't know, obey
--enable-cross-guesses.
+ *)
gl_cv_func_truncate_works="$gl_cross_guess_normal" ;;
esac
])
rm -f conftest.tmp
diff --git a/m4/utime.m4 b/m4/utime.m4
index 0009e4f2f9..b738e1c0a0 100644
--- a/m4/utime.m4
+++ b/m4/utime.m4
@@ -1,4 +1,4 @@
-# utime.m4 serial 5
+# utime.m4 serial 6
dnl Copyright (C) 2017-2024 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -48,14 +48,15 @@ AC_DEFUN([gl_FUNC_UTIME]
[gl_cv_func_utime_file_slash=yes],
[gl_cv_func_utime_file_slash=no],
[case "$host_os" in
- # Guess yes on Linux systems.
- linux-* | linux) gl_cv_func_utime_file_slash="guessing yes" ;;
- # Guess yes on glibc systems.
- *-gnu* | gnu*) gl_cv_func_utime_file_slash="guessing yes" ;;
- # Guess no on macOS.
- darwin*) gl_cv_func_utime_file_slash="guessing no" ;;
- # If we don't know, obey
--enable-cross-guesses.
- *)
gl_cv_func_utime_file_slash="$gl_cross_guess_normal" ;;
+ # Guess yes on Linux systems
+ # and on systems that emulate the Linux
system calls.
+ linux* | midipix*) gl_cv_func_utime_file_slash="guessing yes"
;;
+ # Guess yes on glibc systems.
+ *-gnu* | gnu*) gl_cv_func_utime_file_slash="guessing yes"
;;
+ # Guess no on macOS.
+ darwin*) gl_cv_func_utime_file_slash="guessing no" ;;
+ # If we don't know, obey
--enable-cross-guesses.
+ *)
gl_cv_func_utime_file_slash="$gl_cross_guess_normal" ;;
esac
])
rm -f conftest.tmp conftest.lnk
diff --git a/m4/utimens.m4 b/m4/utimens.m4
index af03e6b52b..0f5bfd4c84 100644
--- a/m4/utimens.m4
+++ b/m4/utimens.m4
@@ -3,7 +3,7 @@
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
-dnl serial 15
+dnl serial 16
AC_DEFUN([gl_UTIMENS],
[
@@ -36,12 +36,13 @@ AC_DEFUN([gl_UTIMENS]
[gl_cv_func_futimesat_works=yes],
[gl_cv_func_futimesat_works=no],
[case "$host_os" in
- # Guess yes on Linux systems.
- linux-* | linux) gl_cv_func_futimesat_works="guessing yes" ;;
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_futimesat_works="guessing yes" ;;
- # If we don't know, obey --enable-cross-guesses.
- *)
gl_cv_func_futimesat_works="$gl_cross_guess_normal" ;;
+ # Guess yes on Linux systems
+ # and on systems that emulate the Linux system
calls.
+ linux* | midipix*) gl_cv_func_futimesat_works="guessing yes" ;;
+ # Guess yes on glibc systems.
+ *-gnu*) gl_cv_func_futimesat_works="guessing yes" ;;
+ # If we don't know, obey --enable-cross-guesses.
+ *)
gl_cv_func_futimesat_works="$gl_cross_guess_normal" ;;
esac
])
rm -f conftest.file])
diff --git a/m4/utimensat.m4 b/m4/utimensat.m4
index e595b333d1..4af7f6f81c 100644
--- a/m4/utimensat.m4
+++ b/m4/utimensat.m4
@@ -1,4 +1,4 @@
-# serial 11
+# serial 12
# See if we need to provide utimensat replacement.
dnl Copyright (C) 2009-2024 Free Software Foundation, Inc.
@@ -83,6 +83,9 @@ AC_DEFUN([gl_FUNC_UTIMENSAT]
# Guess yes on Linux or glibc systems.
linux-* | linux | *-gnu* | gnu*)
gl_cv_func_utimensat_works="guessing yes" ;;
+ # Guess yes on systems that emulate the Linux system calls.
+ midipix*)
+ gl_cv_func_utimensat_works="guessing yes" ;;
# Guess 'nearly' on AIX.
aix*)
gl_cv_func_utimensat_works="guessing nearly" ;;
