From patchwork Tue May 9 14:30:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 49897 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E3CB927BBEB; Tue, 9 May 2023 15:31:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E7AD627BBEA for ; Tue, 9 May 2023 15:31:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwOMr-0006SV-50; Tue, 09 May 2023 10:31:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pwOMp-0006R1-32 for guix-patches@gnu.org; Tue, 09 May 2023 10:31:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pwOMo-0006e0-L0 for guix-patches@gnu.org; Tue, 09 May 2023 10:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pwOMo-0002x5-4R for guix-patches@gnu.org; Tue, 09 May 2023 10:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63392] [PATCH] gnu: barrier: Include NULL compatibility. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 May 2023 14:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63392 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63392@debbugs.gnu.org Cc: Simon Tournier X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168364262711279 (code B ref -1); Tue, 09 May 2023 14:31:01 +0000 Received: (at submit) by debbugs.gnu.org; 9 May 2023 14:30:27 +0000 Received: from localhost ([127.0.0.1]:44111 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pwOMF-0002vq-D5 for submit@debbugs.gnu.org; Tue, 09 May 2023 10:30:27 -0400 Received: from lists.gnu.org ([209.51.188.17]:33820) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pwOMC-0002vh-LP for submit@debbugs.gnu.org; Tue, 09 May 2023 10:30:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pwOMC-0006Aa-D8 for guix-patches@gnu.org; Tue, 09 May 2023 10:30:24 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pwOM9-0006Pm-Fg for guix-patches@gnu.org; Tue, 09 May 2023 10:30:24 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-3f4289f7c1cso3134515e9.0 for ; Tue, 09 May 2023 07:30:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683642616; x=1686234616; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=cxl1N5X2K70BgHNCsJOwgq0ZYf0Sc1IHmhjkILhMoWc=; b=CvlJ9hPixMLeWV/duN0QKH8gkUL/oB/Occ9u74QRiZ1y4ByQ+fMRi5mNX6wI5PQkEW G/TL75mTmI8uD1R/O3G15hb93OwSPxNswu1XK97EuiwVRCD0KQ/jvEI57Ahyzv67oD6t /pNbJfNMgeicI1NX9a0nWPwqKRCpJfnZ3dzSjcfJ4QXymlO/D/HxUrzrCTyFDT13ICDB U5MbedocgR2wGlTFlg4AwPbDA2BC0mJ+x5zveSPReJmdNayIr9Dkn4JO41pnzDEJD71H uJu2LfrMiz3Vbkc1lL3VLRoc0FQXW9Rk+TlfKn2Sh9BKdXhPdUEwyokq2Af9W89l7D3W SfLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683642616; x=1686234616; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=cxl1N5X2K70BgHNCsJOwgq0ZYf0Sc1IHmhjkILhMoWc=; b=QLk3l+tLwrpNdN/pCSfUAxVtURA/lLPJwsX/OBm9NVt2PRULnrYjUC898TPcj4k1Ox lkl2hhxLHf6KCS3mjLT//LdR8+MXEO3SP14PsF8fedGUID/oonrWP8b+ddFuEuiBbo5S avzhGCQp6bWbPmCAubmibiNGm85jgiMUYyhcvZTmuyNhpEiYiSwYl2w4nlKelUct3sVu U6hHiPEj4zORRnta1hvWp/eCQjfaoD4iKxptR3gexhdy51n9yHjwjXu4ulFVlHSicBwe gXr8/jlipFU3M/8xeraUZxYfBahVLgP35nuE4uBD3lb2sVFuCSu+K+jSSRVDIjnChSfe /GPw== X-Gm-Message-State: AC+VfDwMgHzxfMVkLXFxzA9Y2/MSiTOHqVJxyAR7ue6CQmYtlSCmGvaJ jbQwSICMgcuTJxK6HiGduPf1hP3lfWA= X-Google-Smtp-Source: ACHHUZ4L+xwrGqZtUp/FIrUByWn0jDfRfKEBzhXF59XqiwVaZsWER+gVqn3+augHJQBbzo9vDH12bg== X-Received: by 2002:a05:600c:1c9d:b0:3f1:7a10:f2f2 with SMTP id k29-20020a05600c1c9d00b003f17a10f2f2mr10246978wms.1.1683642615552; Tue, 09 May 2023 07:30:15 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id c17-20020adffb11000000b003075428aad5sm14327580wrr.29.2023.05.09.07.30.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 07:30:15 -0700 (PDT) From: Simon Tournier Date: Tue, 9 May 2023 16:30:07 +0200 Message-Id: <4c0fb1d9136b79f73098fa3df7b32c517b867d4d.1683642570.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=zimon.toutoune@gmail.com; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Fixes . Reported by * 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(-) base-commit: 76a3deb8675576a6ce64874234c9d3881060db3b 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 +;;; Copyright © 2023 Simon Tournier ;;; ;;; 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 "))))))) (native-inputs (list googletest pkg-config)) (inputs