From mboxrd@z Thu Jan 1 00:00:00 1970 From: Manolis Ragkousis Subject: [PATCH] build: Remove unneeded conditionals for (guix build syscalls). Date: Fri, 17 Jun 2016 23:04:03 +0300 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------55B6B28EDBF0B060D852C138" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52619) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDzzy-0006kB-Tm for guix-devel@gnu.org; Fri, 17 Jun 2016 16:04:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDzzw-0000Ck-Ps for guix-devel@gnu.org; Fri, 17 Jun 2016 16:04:13 -0400 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org This is a multi-part message in MIME format. --------------55B6B28EDBF0B060D852C138 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit 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 --------------55B6B28EDBF0B060D852C138 Content-Type: text/x-patch; name="0001-build-Remove-unneeded-conditionals-for-guix-build-sy.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0001-build-Remove-unneeded-conditionals-for-guix-build-sy.pa"; filename*1="tch" =46rom 092430944b12fc23d3ece26cb72baf3443217bee Mon Sep 17 00:00:00 2001 From: Manolis Ragkousis 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 =3D \ 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 +=3D \ =20 endif =20 -if BUILD_SYSCALLS_MODULE - -MODULES +=3D \ - guix/build/syscalls.scm - -endif - if BUILD_DAEMON_OFFLOAD =20 MODULES +=3D \ @@ -384,13 +378,6 @@ EXTRA_DIST +=3D \ =20 endif !BUILD_DAEMON_OFFLOAD =20 -if !BUILD_SYSCALLS_MODULE - -EXTRA_DIST +=3D \ - guix/build/syscalls.scm - -endif !BUILD_SYSCALLS_MODULE - =20 CLEANFILES =3D \ $(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 ou= r own if it doesn't. GUIX_CHECK_SRFI_37 AM_CONDITIONAL([INSTALL_SRFI_37], [test "x$ac_cv_guix_srfi_37_broken" =3D= xyes]) =20 -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" =3D "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 ]) =20 -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_moun= t], - [GUILE_CHECK([retval], [(dynamic-func \"mount\" (dynamic-link))]) - if test "$retval" =3D 0; then - guix_cv_libc_has_mount=3D"yes" - else - guix_cv_libc_has_mount=3D"no" - fi]) -]) - dnl GUIX_LIBGCRYPT_LIBDIR VAR dnl dnl Attempt to determine libgcrypt's LIBDIR; store the result in VAR. --=20 2.8.3 --------------55B6B28EDBF0B060D852C138--