From patchwork Sun Jun 18 20:53:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 51063 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 ED7C227BBE2; Sun, 18 Jun 2023 21:54:39 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 B8AF427BBEA for ; Sun, 18 Jun 2023 21:54:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qAzPP-0006bx-S0; Sun, 18 Jun 2023 16:54:03 -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 1qAzPO-0006b2-Fd for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:02 -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 1qAzPO-0002E2-5x for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qAzPN-0007SS-M6 for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64137] [PATCH v2 1/8] gnu: Add mpark-variant. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Jun 2023 20:54:01 +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.168712161428541 (code B ref 64137); Sun, 18 Jun 2023 20:54:01 +0000 Received: (at 64137) by debbugs.gnu.org; 18 Jun 2023 20:53:34 +0000 Received: from localhost ([127.0.0.1]:55027 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAzOv-0007QH-RM for submit@debbugs.gnu.org; Sun, 18 Jun 2023 16:53:34 -0400 Received: from mout02.posteo.de ([185.67.36.66]:43185) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAzOt-0007Pz-PE for 64137@debbugs.gnu.org; Sun, 18 Jun 2023 16:53:33 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id D9EF5240101 for <64137@debbugs.gnu.org>; Sun, 18 Jun 2023 22:53:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687121605; bh=gCyLr1V7iGAypZxq5cuYu/3Xi5M2BHUl2u6QBQM1jNk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=DMaxM7qNEOJh5dah4cZnTfznCavvK7/5nZ/EFjJqUsKprcr1tPvRCphXwJbiMN+nT eW2fEdwTLFAm+oE9J6YPxP00JZ4v4eX7clO/ZiuP45XQOGEM1S2rrhaQih7LGwGY9h /OC2BZgYicWiNlQgIDLW5ECA5IQChEOWpwTYrw46S0voy8aDo1rEbdmkZds9HfpDUX KHRH//WaLTKHDPfZC3eJyc/0hbCT8WNzAkM0quSCYKgroahsullVV2eoeBo2rcC4l4 PaNVWvc9qp58pD/0NPTI1hCiSFwSjkwmhwwTKtIKuYB4TQ9H3+bHcLV/NXW/o9dXj0 WFWVb/k30OpXw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QklVF3k0Rz6tm4; Sun, 18 Jun 2023 22:53:25 +0200 (CEST) From: David Elsing Date: Sun, 18 Jun 2023 20:53:00 +0000 Message-Id: <290bd1b3b75a4f870923952f77dca2d096e7529b.1687121561.git.david.elsing@posteo.net> In-Reply-To: <7yh6r4ebw2.fsf@posteo.net> References: <7yh6r4ebw2.fsf@posteo.net> MIME-Version: 1.0 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 * 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..5a6298fc4d 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 the C++17 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)))