summaryrefslogtreecommitdiff
path: root/config-daemon.ac
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-11-13 11:44:34 +0100
committerLudovic Courtès <ludo@gnu.org>2019-11-13 23:26:35 +0100
commit298fb2907e3f432cea7dee9f58e89ab8d9dbd56f (patch)
treead9ea51a3e52900821f83eed8a496d74e058f590 /config-daemon.ac
parent887fd835a7c90f720d36a211478012547feaead0 (diff)
daemon: Don't include <linux/fs.h>.
As of GNU libc 2.29, <sys/mount.h> declares all the constants and functions we need, so there's no use in including <linux/fs.h> anymore. This silences annoying warnings like this one: In file included from nix/libstore/local-store.cc:32:0: /gnu/store/…-linux-libre-headers-4.19.56/include/linux/fs.h:108:0: warning: "MS_RDONLY" redefined #define MS_RDONLY 1 /* Mount read-only */ In file included from nix/libstore/local-store.cc:28:0: /gnu/store/…-glibc-2.29/include/sys/mount.h:36:0: note: this is the location of the previous definition #define MS_RDONLY MS_RDONLY * config-daemon.ac: Remove check for <linux/fs.h>. * nix/libstore/build.cc: Remove conditional inclusion of <linux/fs.h>. * nix/libstore/local-store.cc: Remove "#if HAVE_LINUX_FS_H" and inclusion of <linux/fs.h>.
Diffstat (limited to 'config-daemon.ac')
-rw-r--r--config-daemon.ac3
1 files changed, 0 insertions, 3 deletions
diff --git a/config-daemon.ac b/config-daemon.ac
index bf94815966d..848e1e58da1 100644
--- a/config-daemon.ac
+++ b/config-daemon.ac
@@ -115,9 +115,6 @@ if test "x$guix_build_daemon" = "xyes"; then
115 dnl to do i686-linux builds on x86_64-linux machines. 115 dnl to do i686-linux builds on x86_64-linux machines.
116 AC_CHECK_HEADERS([sys/personality.h]) 116 AC_CHECK_HEADERS([sys/personality.h])
117 117
118 dnl Check for <linux/fs.h> (for immutable file support).
119 AC_CHECK_HEADERS([linux/fs.h])
120
121 dnl Determine the appropriate default list of substitute URLs (GnuTLS 118 dnl Determine the appropriate default list of substitute URLs (GnuTLS
122 dnl is required so we can default to 'https'.) 119 dnl is required so we can default to 'https'.)
123 guix_substitute_urls="https://ci.guix.gnu.org" 120 guix_substitute_urls="https://ci.guix.gnu.org"