ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 05:48:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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.
This commit is contained in:
Manolis Ragkousis 2016-06-17 22:44:37 +03:00
parent a12f6f498a
commit 875715cabf
No known key found for this signature in database
GPG key ID: 327C1EF38DF54C32
3 changed files with 1 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Makefile.am
View file

@ -101,6 +101,7 @@ MODULES = \
guix/build/rpath.scm \ guix/build/rpath.scm \
guix/build/cvs.scm \ guix/build/cvs.scm \
guix/build/svn.scm \ guix/build/svn.scm \
guix/build/syscalls.scm \
guix/build/gremlin.scm \ guix/build/gremlin.scm \
guix/build/emacs-utils.scm \ guix/build/emacs-utils.scm \
guix/build/graft.scm \ guix/build/graft.scm \
@ -157,13 +158,6 @@ MODULES += \
endif endif
if BUILD_SYSCALLS_MODULE
MODULES += \
guix/build/syscalls.scm
endif
if BUILD_DAEMON_OFFLOAD if BUILD_DAEMON_OFFLOAD
MODULES += \ MODULES += \
@ -384,13 +378,6 @@ EXTRA_DIST += \
endif !BUILD_DAEMON_OFFLOAD endif !BUILD_DAEMON_OFFLOAD
if !BUILD_SYSCALLS_MODULE
EXTRA_DIST += \
guix/build/syscalls.scm
endif !BUILD_SYSCALLS_MODULE
CLEANFILES = \ CLEANFILES = \
$(GOBJECTS) \ $(GOBJECTS) \

5
configure.ac
View file

@ -86,11 +86,6 @@ dnl Check whether (srfi srfi-37) works, and provide our own if it doesn't.
GUIX_CHECK_SRFI_37 GUIX_CHECK_SRFI_37
AM_CONDITIONAL([INSTALL_SRFI_37], [test "x$ac_cv_guix_srfi_37_broken" = xyes]) 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. dnl Decompressors, for use by the substituter and other modules.
AC_PATH_PROG([GZIP], [gzip]) AC_PATH_PROG([GZIP], [gzip])
AC_PATH_PROG([BZIP2], [bzip2]) AC_PATH_PROG([BZIP2], [bzip2])

13
m4/guix.m4
View file

@ -280,19 +280,6 @@ AC_DEFUN([GUIX_ASSERT_CXX11], [
fi 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 GUIX_LIBGCRYPT_LIBDIR VAR
dnl dnl
dnl Attempt to determine libgcrypt's LIBDIR; store the result in VAR. dnl Attempt to determine libgcrypt's LIBDIR; store the result in VAR.