guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

14/16: gnu: log4cpp: Fix build with glibc 2.31.


From: guix-commits
Subject: 14/16: gnu: log4cpp: Fix build with glibc 2.31.
Date: Sat, 14 Mar 2020 07:03:57 -0400 (EDT)

mbakke pushed a commit to branch core-updates
in repository guix.

commit 641b9c51b7f21ecf7e3eeca6d3c2c0ceb14c9027
Author: Marius Bakke <address@hidden>
AuthorDate: Sat Mar 14 01:25:08 2020 +0100

    gnu: log4cpp: Fix build with glibc 2.31.
    
    * gnu/packages/logging.scm (log4cpp)[arguments]: New field.
---
 gnu/packages/logging.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm
index d75c44a..86ebee3 100644
--- a/gnu/packages/logging.scm
+++ b/gnu/packages/logging.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <address@hidden>
 ;;; Copyright © 2019 Gábor Boskovits <address@hidden>
 ;;; Copyright © 2019 Meiyo Peng <address@hidden>
+;;; Copyright © 2020 Marius Bakke <address@hidden>
 ;;;
 ;;; 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,



reply via email to

[Prev in Thread] Current Thread [Next in Thread]