diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-01-05 17:15:41 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-01-07 23:47:22 +0100 |
| commit | 29a686688674dc875775305312513405fa396a06 (patch) | |
| tree | 9e5f286444b8e663f3f99503c8bdc526aeb67c14 /config-daemon.ac | |
| parent | 896fec476f728183b331cbb6e2afb891207b4205 (diff) | |
| download | guix-29a686688674dc875775305312513405fa396a06.tar guix-29a686688674dc875775305312513405fa396a06.tar.gz | |
daemon: Add gzip log compression.
* nix/nix-daemon/guix-daemon.cc (GUIX_OPT_LOG_COMPRESSION): New macro.
(options): Mark "disable-log-compression" as hidden and add
"log-compression".
(parse_opt): Handle GUIX_OPT_LOG_COMPRESSION.
* nix/libstore/build.cc (DerivationGoal): Add 'gzLogFile'.
(openLogFile): Initialize it when 'logCompression' is COMPRESSION_GZIP.
(closeLogFile, handleChildOutput): Honor 'gzLogFile'.
* nix/libstore/globals.hh (Settings)[compressLog]: Remove.
[logCompression]: New field.
(CompressionType): New enum.
* nix/libstore/globals.cc (Settings::Settings): Initialize it.
(update): Remove '_get' call for 'compressLog'.
* nix/local.mk (guix_daemon_LDADD, guix_register_LDADD): Add -lz.
* guix/store.scm (log-file): Handle '.gz' log files.
* tests/guix-daemon.sh: Add test with '--log-compression=gzip'.
* doc/guix.texi (Invoking guix-daemon): Adjust accordingly.
* config-daemon.ac: Check for libz and zlib.h.
Diffstat (limited to 'config-daemon.ac')
| -rw-r--r-- | config-daemon.ac | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config-daemon.ac b/config-daemon.ac index 42b59819d3..59f6f2713f 100644 --- a/config-daemon.ac +++ b/config-daemon.ac @@ -18,6 +18,12 @@ if test "x$guix_build_daemon" = "xyes"; then dnl Use 64-bit file system calls so that we can support files > 2 GiB. AC_SYS_LARGEFILE + dnl Look for zlib, a required dependency. + AC_CHECK_LIB([z], [gzdopen], [true], + [AC_MSG_ERROR([Guix requires zlib. See http://www.zlib.net/.])]) + AC_CHECK_HEADERS([zlib.h], [true], + [AC_MSG_ERROR([Guix requires zlib. See http://www.zlib.net/.])]) + dnl Look for libbz2, a required dependency. AC_CHECK_LIB([bz2], [BZ2_bzWriteOpen], [true], [AC_MSG_ERROR([Guix requires libbz2, which is part of bzip2. See http://www.bzip.org/.])]) |