GNU bug report logs - #63392
[PATCH] gnu: barrier: Include NULL compatibility.

Previous Next

Full log

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Simon Tournier <zimon.toutoune <at> gmail.com>
To: guix-patches <at> gnu.org
Cc: Simon Tournier <zimon.toutoune <at> gmail.com>
Subject: [PATCH] gnu: barrier: Include NULL compatibility.
Date: Tue,  9 May 2023 16:30:07 +0200

Fixes <https://bugs.gnu.org/63244>.
Reported by <john <at> fremlin.org>

* gnu/packages/barrier.scm (barrier)[arguments]: Use G-exp, add phases
including NULL macro.
---
 gnu/packages/barrier.scm | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/barrier.scm b/gnu/packages/barrier.scm
index 5c2ecb0f2f..be0e52349b 100644
--- a/gnu/packages/barrier.scm
+++ b/gnu/packages/barrier.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2022 Mathieu Othacehe <othacehe <at> gnu.org>
+;;; Copyright © 2023 Simon Tournier <zimon.toutoune <at> gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -19,6 +20,7 @@
 (define-module (gnu packages barrier)
   #:use-module (guix build-system cmake)
   #:use-module (guix utils)
+  #:use-module (guix gexp)
   #:use-module (guix git-download)
   #:use-module (guix download)
   #:use-module ((guix licenses) #:prefix license:)
@@ -48,9 +50,17 @@ (define-public barrier
         (base32 "19bwa9qidq2mxv1fkyxxc1xdmv3jx6bj35bkaaw70jzkblnfmlfs"))))
     (build-system cmake-build-system)
     (arguments
-     '(#:configure-flags
-       (list "-DBARRIER_USE_EXTERNAL_GTEST=ON")
-       #:tests? #f)) ;tests require a running x server
+     (list
+      #:configure-flags
+      #~(list "-DBARRIER_USE_EXTERNAL_GTEST=ON")
+      #:tests? #f ;; tests require a running x server
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-null
+            (lambda _
+              (substitute* "src/lib/base/Event.h"
+                (("#include \"common/stdmap\\.h\"")
+                 "#include \"common/stdmap.h\"\n#include <cstddef>")))))))
     (native-inputs
      (list googletest pkg-config))
     (inputs

base-commit: 76a3deb8675576a6ce64874234c9d3881060db3b
-- 
2.38.1

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.