diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-03-14 01:25:08 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-14 12:02:53 +0100 |
commit | 641b9c51b7f21ecf7e3eeca6d3c2c0ceb14c9027 (patch) | |
tree | 5ec54d65126b31a5f77776b59a7f6c16ef1b8d20 | |
parent | 75ca2cdaff06b125b39a4f71499efcb73aa94b6c (diff) | |
download | guix-641b9c51b7f21ecf7e3eeca6d3c2c0ceb14c9027.tar.gz |
gnu: log4cpp: Fix build with glibc 2.31.
* gnu/packages/logging.scm (log4cpp)[arguments]: New field.
-rw-r--r-- | gnu/packages/logging.scm | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index d75c44aea6..86ebee35cd 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2019 Meiyo Peng <meiyo@riseup.net> +;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -53,6 +54,17 @@ (base32 "07gmr3jyaf2239n9sp6h7hwdz1pv7b7aka8n06gmr2fnlmaymfrc")))) (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'do-not-call-stime + (lambda _ + ;; Patch out use of 'stime' which was removed from glibc 2.31. + ;; The test would not work in the build container anyway. + (substitute* "tests/testDailyRollingFileAppender.cpp" + (("if \\(stime\\(&now\\) == -1\\)") + "if (1)")) + #t))))) (synopsis "Log library for C++") (description "Log4cpp is library of C++ classes for flexible logging to files, syslog, |