From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id obaLOWERmGTqAgEASxT56A (envelope-from ) for ; Sun, 25 Jun 2023 12:05:22 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id AHA+OGERmGRDugAAauVa8A (envelope-from ) for ; Sun, 25 Jun 2023 12:05:21 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A2AA496E1 for ; Sun, 25 Jun 2023 12:05:21 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDMcC-0002pp-B6; Sun, 25 Jun 2023 06:05:04 -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 1qDMcB-0002pR-11 for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05: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 1qDMcA-0008Kx-LT for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qDMcA-0000Kx-GG for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64137] [PATCH v3 1/7] gnu: Add mpark-variant. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 25 Jun 2023 10:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64137 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64137@debbugs.gnu.org Cc: David Elsing Received: via spool by 64137-submit@debbugs.gnu.org id=B64137.16876874621162 (code B ref 64137); Sun, 25 Jun 2023 10:05:02 +0000 Received: (at 64137) by debbugs.gnu.org; 25 Jun 2023 10:04:22 +0000 Received: from localhost ([127.0.0.1]:42031 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDMbW-0000If-DM for submit@debbugs.gnu.org; Sun, 25 Jun 2023 06:04:22 -0400 Received: from mout01.posteo.de ([185.67.36.65]:38983) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDMbT-0000IQ-OZ for 64137@debbugs.gnu.org; Sun, 25 Jun 2023 06:04:20 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 2AEC1240027 for <64137@debbugs.gnu.org>; Sun, 25 Jun 2023 12:04:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687687454; bh=W7CeCQH5ONaVb5ymZ1eq3wuOEqiPgRjBcqmDQaXTbfY=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=D/rg3UndG17s1goC9coB0o2w0W/ffoEtUNeuV0nWLWQA4ixQMc2AVF7BDebMwJCO3 Znv/alhPAbKfYh2sQqn8FP4DwYVMUWH3fCpOavgMNOuS6E61Kc7cmWzvXtx8OsI4k8 wzeaSM6FwM8d0hcqh1xxgxOjwSxnWpNJq/uqp1iover25ae35hHcy1kgRM7XlorNij GTl2D8zf0C+DxCE7Hzanu1tjQ0NoD3f9ZICA6e7DypMKFdjE+1mNR6VMP9kSEAFnlw IhXQSgg77QOIWA1GtGnNmcvfkGW2szN3nCVw+g3krG9ofWJ6RidBsYEdORTNxQorDF f9duNojXOzwEw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Qpmlx3jynz6tv5; Sun, 25 Jun 2023 12:04:13 +0200 (CEST) From: David Elsing Date: Sun, 25 Jun 2023 10:03:53 +0000 Message-Id: In-Reply-To: <7yo7l3x3ll.fsf@posteo.net> References: <7yo7l3x3ll.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1687687521; a=rsa-sha256; cv=none; b=e2oOi7z7ye9zEkFpXX3qdcNP81jcIoEm5vDcVYvfz42wrv3e0UZf56K2t5KBMDzNM1K8A3 JTEUuWiP1ie7kU8WDVzYcFMEtafSBeBsUVipkx+1z+asgFK6BNj90TA4CAa5J9/mns0jFg nI21p7+XYfntQwwM1f+a7Hl6TR5ZBFTXkrPXPDUftp9w05ywC+gWonPx/2YmErgrOsHlLC /2noqWcuFEZKXAiOuQHP0vW7xgI6YCG6ePZpxXvAI4U/aG+zhLcgopnC327RswgpC7vDCK mljhNLDcJPPaCWeLXsceKaAJqiqAxTvMoc0vofbfylLcA+y4sYqXWvsqfujw5w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b="D/rg3Und"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1687687521; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=3dkBcfQmPbXsdax+1kcrFl5UmNmpGlqej75/ZZ61//k=; b=g6Z1WJ4J06tqQYOy/v7X4+03KCiSQf92J+0KbDXZYHnzOz/DPvAI4NOs4I2hOszjZXdNJU bo7QlsDkRv21aqsLTuL5YD4BSaOaxNlXFTqQh5waBq6W1rPSOh7cb6EgMLiGBDoLw3m59t hvFNqiNqRLLLzf3VxJoxxwD8aGyfZYl25e9dJESQYyIJ6wFaPsoCSPASQQOumtvV8WVi7s 4Fe0VvbMQrqmRcO1h7LmLWjP5lHwkTLCmtJNwNp2RKiey2DA4Mw9/F4Ji8mSZi3RCcjy60 2lYOlDxVOSrcNOuC37SAvRV02cyd2Cr6ROZuxVCSUuydojMkeAe/AJHrUPiwnA== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b="D/rg3Und"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -0.45 X-Spam-Score: -0.45 X-Migadu-Queue-Id: A2AA496E1 X-TUID: 6cD6ABlDBwon * gnu/packages/cpp.scm (mpark-variant): New variable. --- gnu/packages/cpp.scm | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 39a34c20dd..8139a9d083 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -29,7 +29,7 @@ ;;; Copyright © 2022 muradm ;;; Copyright © 2022 Attila Lendvai ;;; Copyright © 2022 Arun Isaac -;;; Copyright © 2022 David Elsing +;;; Copyright © 2022, 2023 David Elsing ;;; Copyright © 2022, 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2023 Sughosha @@ -2553,3 +2553,38 @@ (define-public ftxui @item No dependencies. @end itemize") (license license:expat))) + +(define-public mpark-variant + (package + (name "mpark-variant") + (version "1.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mpark/variant") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0gz8d5qprlfqb42cfyyc4nbwhgarhw027a9nr52h3gbdn560j0j4")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DMPARK_VARIANT_INCLUDE_TESTS=mpark") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'find-googletest + (lambda _ + (substitute* "test/CMakeLists.txt" + (("add_subdirectory.*3rdparty/googletest.*\n") + "find_package(GTest REQUIRED)\n") + ((".*3rdparty/googletest.*\n") "") + ((".*config_compiler_and_linker.*\n") "") + (("gtest_main") "gtest gtest_main"))))))) + (native-inputs (list googletest)) + (home-page "https://github.com/mpark/variant") + (synopsis "Implementation of std::variant for C++11/14/17") + (description + "MPark.Variant provides the C++17 std::variant for C++11/14/17. It is +based on the implementation of std::variant in libc++.") + (license license:boost1.0))) -- 2.40.1