Re: [PATCH] syscalls: Turn syscalls wrappers into procedures.

[Ludovic Courtès]

Manolis Ragkousis <address@hidden> skribis:

> In hurd there are some syscalls that are not available. By turning
> those scheme wrappers in procedures we can just delegate their
> evaluation till they are actually needed, thus bypassing the need for
> them to actually exist for now and enable guix to build on Hurd.

(Sorry again for the delay.)

As I wrote elsewhere, I’d prefer to simply omit compilation of this file
on GNU/Hurd.  If that’s fine with you, I’ll commit the patch below.

Thanks,
Ludo’.

diff --git a/Makefile.am b/Makefile.am
index ada4cbe..4a3a2d8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -88,7 +88,6 @@ MODULES =                                     \
   guix/build/rpath.scm                         \
   guix/build/cvs.scm                           \
   guix/build/svn.scm                           \
-  guix/build/syscalls.scm                      \
   guix/build/gremlin.scm                       \
   guix/build/emacs-utils.scm                   \
   guix/build/graft.scm                         \
@@ -124,6 +123,13 @@ MODULES =                                  \
   guix.scm                                     \
   $(GNU_SYSTEM_MODULES)
 
+if BUILD_SYSCALLS_MODULE
+
+MODULES +=                                     \
+  guix/build/syscalls.scm                      \
+
+endif
+
 if BUILD_DAEMON_OFFLOAD
 
 MODULES +=                                     \
@@ -298,6 +304,12 @@ EXTRA_DIST +=                                      \
 
 endif !BUILD_DAEMON_OFFLOAD
 
+if !BUILD_SYSCALLS_MODULE
+
+EXTRA_DIST += guix/build/syscalls.scm
+
+endif !BUILD_SYSCALLS_MODULE
+
 
 CLEANFILES =                                   \
   $(GOBJECTS)                                  \
diff --git a/configure.ac b/configure.ac
index 2c8b9f0..247a9d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,6 +85,11 @@ dnl Check whether (srfi srfi-37) works, and provide our own 
if it doesn't.
 GUIX_CHECK_SRFI_37
 AM_CONDITIONAL([INSTALL_SRFI_37], [test "x$ac_cv_guix_srfi_37_broken" = xyes])
 
+dnl Check whether (guix build syscalls) can be built.
+GUIX_CHECK_LIBC_MOUNT
+AM_CONDITIONAL([BUILD_SYSCALLS_MODULE],
+  [test "x$guix_cv_libc_has_mount" = "xyes"])
+
 AC_ARG_WITH([nix-prefix],
   [AS_HELP_STRING([--with-nix-prefix=DIR],
     [search for Nix in DIR (for testing purposes and '--disable-daemon' 
builds)])],
diff --git a/m4/guix.m4 b/m4/guix.m4
index fa5a402..2113383 100644
--- a/m4/guix.m4
+++ b/m4/guix.m4
@@ -257,3 +257,16 @@ AC_DEFUN([GUIX_ASSERT_CXX11], [
     AC_MSG_ERROR([C++ compiler '$CXX' does not support the C++11 standard])
   fi
 ])
+
+dnl GUIX_CHECK_LIBC_MOUNT
+dnl
+dnl Check whether libc provides 'mount'.  On GNU/Hurd it doesn't (yet).
+AC_DEFUN([GUIX_CHECK_LIBC_MOUNT], [
+  AC_CACHE_CHECK([whether libc provides 'mount'], [guix_cv_libc_has_mount],
+    [GUILE_CHECK([retval], [(dynamic-func \"mount\" (dynamic-link))])
+     if test "$retval" = 0; then
+       guix_cv_libc_has_mount="yes"
+     else
+       guix_cv_libc_has_mount="no"
+     fi])
+])