diff mbox

build: Remove unneeded conditionals for (guix build syscalls).

Message ID e0d4aa03-af12-2031-d446-6f6df0192543@gmail.com
State New
Headers show

Commit Message

Manolis Ragkousis June 17, 2016, 8:04 p.m. UTC 
Hello everyone,

This patch reverts the changes made in commit
12e5b26643e2269e8f30d8399886d4302c3c09d1 by Ludo which are no longer
needed because of commit 4f8cede062cf89a8326842c6a60e8e0178a78b2c.

The reason I didn't use git revert is because it couldn't work so I had
to remove the changes manually.

Thank you,
Manolis

Comments

Ludovic Courtès June 19, 2016, 1:59 p.m. UTC | #1 
Manolis Ragkousis <manolis837@gmail.com> skribis:

> From 092430944b12fc23d3ece26cb72baf3443217bee Mon Sep 17 00:00:00 2001
> From: Manolis Ragkousis <manolis837@gmail.com>
> Date: Fri, 17 Jun 2016 22:44:37 +0300
> Subject: [PATCH] build: Remove unneeded conditionals for (guix build
>  syscalls).
>
> * m4/guix.m4: Remove 'GUIX_CHECK_LIBC_MOUNT'.
> * configure.ac: Remove 'BUILD_SYSCALLS_MODULE'.
> * Makefile.am (MODULES): Add 'guix/build/syscalls.scm'.
>   (EXTRA_DIST): Remove conditional on BUILD_SYSCALLS_MODULE.

LGTM, thanks!

Ludo’.
diff mbox

Patch

From 092430944b12fc23d3ece26cb72baf3443217bee Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <manolis837@gmail.com>
Date: Fri, 17 Jun 2016 22:44:37 +0300
Subject: [PATCH] build: Remove unneeded conditionals for (guix build
 syscalls).

* m4/guix.m4: Remove 'GUIX_CHECK_LIBC_MOUNT'.
* configure.ac: Remove 'BUILD_SYSCALLS_MODULE'.
* Makefile.am (MODULES): Add 'guix/build/syscalls.scm'.
  (EXTRA_DIST): Remove conditional on BUILD_SYSCALLS_MODULE.
---
 Makefile.am  | 15 +--------------
 configure.ac |  5 -----
 m4/guix.m4   | 13 -------------
 3 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 2ecb6ee..0dfade8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -99,6 +99,7 @@  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				\
@@ -157,13 +158,6 @@  MODULES +=					\
 
 endif
 
-if BUILD_SYSCALLS_MODULE
-
-MODULES +=					\
-  guix/build/syscalls.scm
-
-endif
-
 if BUILD_DAEMON_OFFLOAD
 
 MODULES +=					\
@@ -384,13 +378,6 @@  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 7c6fcc9..1f5c549 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,11 +86,6 @@  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"])
-
 dnl Decompressors, for use by the substituter and other modules.
 AC_PATH_PROG([GZIP], [gzip])
 AC_PATH_PROG([BZIP2], [bzip2])
diff --git a/m4/guix.m4 b/m4/guix.m4
index 3396e05..6880b5d 100644
--- a/m4/guix.m4
+++ b/m4/guix.m4
@@ -283,19 +283,6 @@  AC_DEFUN([GUIX_ASSERT_CXX11], [
   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])
-])
-
 dnl GUIX_LIBGCRYPT_LIBDIR VAR
 dnl
 dnl Attempt to determine libgcrypt's LIBDIR; store the result in VAR.
-- 
2.8.3