From patchwork Sat Oct 10 16:50:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 24540 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 EC29F27BBE9; Sat, 10 Oct 2020 17:53:59 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, HTML_MESSAGE,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 09D1127BBEA for ; Sat, 10 Oct 2020 17:53:56 +0100 (BST) Received: from localhost ([::1]:51778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kRI83-0004Io-76 for patchwork@mira.cbaines.net; Sat, 10 Oct 2020 12:53:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50084) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRI5G-0002m2-7Y for guix-patches@gnu.org; Sat, 10 Oct 2020 12:51:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55108) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kRI5F-0000Ko-UY for guix-patches@gnu.org; Sat, 10 Oct 2020 12:51:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kRI5F-0002y1-RG for guix-patches@gnu.org; Sat, 10 Oct 2020 12:51:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43620] [PATCH 2/2] gnu: Add folly. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 10 Oct 2020 16:51:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43620 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: 43620@debbugs.gnu.org Received: via spool by 43620-submit@debbugs.gnu.org id=B43620.160234864211376 (code B ref 43620); Sat, 10 Oct 2020 16:51:01 +0000 Received: (at 43620) by debbugs.gnu.org; 10 Oct 2020 16:50:42 +0000 Received: from localhost ([127.0.0.1]:38421 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kRI4s-0002xM-6G for submit@debbugs.gnu.org; Sat, 10 Oct 2020 12:50:42 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:33543) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kRI4m-0002x2-Nm for 43620@debbugs.gnu.org; Sat, 10 Oct 2020 12:50:37 -0400 Received: by mail-wr1-f66.google.com with SMTP id b8so392112wrn.0 for <43620@debbugs.gnu.org>; Sat, 10 Oct 2020 09:50:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=HXKhOaWA0zfgpMns0GZ6F4eI5qP8ROy4e7/v8T6dmDw=; b=k4Sw5KqI7LM32LB5kRT9F2qhe20HEyJ0M6oEhVJYd/jCIRP8Y4H9frMl8Ps8RUDy2Y QwM7/AGioCz9W5a9Fv+zvQq1xjQzf/ipPm8og5drSzG9M+l1MGdqcMUdznlYjpQIji9z rcN1HhctZZm5rmoS9L7zGwdZjysq+lq/i+zQtxNraQo35ZQPchZkgmgRqZ9RWm6v3qdM nkM9eJ3j9vFXWJU6YvV7OfW+LFN35cBzC2lcdROAhizTGqnKe8EjIdcTNGLArSukrP6m PuxXz9FH64/3liKZVATGFr8E2cNCLIdWyjfwW1Kg0KuEJAd0JasQaq0BxeU+FhTlks5a kGLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=HXKhOaWA0zfgpMns0GZ6F4eI5qP8ROy4e7/v8T6dmDw=; b=I/ss623owE+1eZ+wCm6of5jBBWd4Xtt+PGx1J3Xyt36mHsQniwlw7y/NmJhZCcBcyq f8Msffs3xLd0bzSKrpJAmnBGnfw4ZfRgAxcSA6kWsYjM50AieWFB6fwy9HyvsJx79Xhv m61hi06QdIc1iPNv0laHdiIh7vc7KK5vwD61q0jebXWaWXpxa4cEmKLb/AWy0fAkDIYS lMvFny61o++7Gsd0+N1hz2CNfILhc9j47Q9UPiZ8hKV1B24wAw1NPMIOCPM8D3DyD3XU Ed2mP76ENU+kWPgIs3AWxUEnZBJBZJNAuaxnUepRmLW0RkqNfxyccwhchLYBpkd81N3H jvfg== X-Gm-Message-State: AOAM531+KaX51BmOs4B6zp3G6r7WNn6xaSqgr87o7TVksAwM/HmklA1E D4QNRzgPbBnz3Ams1MgzJ/+J7Rd3z4YMu86pjrZPY3HRWh/BF/Cw X-Google-Smtp-Source: ABdhPJyuPAqvzBHZliEVs71Q2QANJ+vDFbWGCmvDI7yJgxJTgJbyBm2Prjp0U25Xn/xkE6mS843Wvd2/GfJikQVHWY0= X-Received: by 2002:a5d:5449:: with SMTP id w9mr22023587wrv.182.1602348626636; Sat, 10 Oct 2020 09:50:26 -0700 (PDT) MIME-Version: 1.0 References: <87r1qk48gv.fsf@gnu.org> In-Reply-To: <87r1qk48gv.fsf@gnu.org> From: Greg Hogan Date: Sat, 10 Oct 2020 12:50:15 -0400 Message-ID: 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" X-getmail-retrieved-from-mailbox: Patches This patch depends on #43619 Reworded synopsis and description. Updated to newest version. Limited to 64-bit architectures. From 8e3df10ad8aa791e34a5a5abcaabe0438f7b063a Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 22 Sep 2020 15:22:32 +0000 Subject: [PATCH] gnu: Add folly. * gnu/packages/cpp.scm (folly): New variable. --- gnu/local.mk | 1 + gnu/packages/cpp.scm | 61 +++++++++++++++++++ .../patches/folly-add-missing-include.patch | 10 +++ 3 files changed, 72 insertions(+) create mode 100644 gnu/packages/patches/folly-add-missing-include.patch diff --git a/gnu/local.mk b/gnu/local.mk index 83d2d72ab1..155de6c590 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -966,6 +966,7 @@ dist_patch_DATA = \ %D%/packages/patches/findutils-localstatedir.patch \ %D%/packages/patches/findutils-test-rwlock-threads.patch \ %D%/packages/patches/flann-cmake-3.11.patch \ + %D%/packages/patches/folly-add-missing-include.patch \ %D%/packages/patches/foobillard++-pkg-config.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \ diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index d3daae74c0..680a2ad520 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -41,12 +41,22 @@ #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages code) #:use-module (gnu packages compression) + #:use-module (gnu packages crypto) + #:use-module (gnu packages gcc) + #:use-module (gnu packages libevent) + #:use-module (gnu packages libunwind) + #:use-module (gnu packages linux) #:use-module (gnu packages llvm) + #:use-module (gnu packages logging) + #:use-module (gnu packages maths) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages popt) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages tls) #:use-module (gnu packages web)) @@ -669,3 +679,54 @@ parsers according to a Parsing Expression Grammar (PEG).") standard GNU style syntax for options.") (home-page "https://github.com/jarro2783/cxxopts/wiki") (license license:expat))) + +(define-public folly + (package + (name "folly") + (version "2020.10.05.00") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/facebook/folly") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0q4w4cvjxffc462hvs8h4zryq4965j7015zvkwagcm6cj6wmz3cn")) + (patches (search-patches "folly-add-missing-include.patch")))) + (build-system cmake-build-system) + (arguments + '(;; Tests must be explicitly enabled + ;#:configure-flags + ;'("-DBUILD_TESTS=ON"))) + ;; Leave tests disabled; see https://github.com/facebook/folly/issues/1456 + #:tests? #f)) + (propagated-inputs + `(("boost" ,boost) + ("gflags" ,gflags) + ("glog" ,glog) + ("liburing" ,liburing))) + (inputs + `(("bzip2" ,bzip2) + ("double-conversion" ,double-conversion) + ("fmt" ,fmt) + ("libaio" ,libaio) + ("libevent" ,libevent) + ("libiberty" ,libiberty) + ("libsodium" ,libsodium) + ("libunwind" ,libunwind) + ("lz4" ,lz4) + ("openssl" ,openssl) + ("snappy" ,snappy) + ("zlib" ,zlib) + ("zstd" ,zstd "lib"))) + (native-inputs + `(("googletest" ,googletest))) + (synopsis "Collection of C++ components complementing the standard library") + (description + "Folly (acronymed loosely after Facebook Open Source Library) is a library +of C++14 components which complements @code{std} and Boost.") + (home-page "https://github.com/facebook/folly/wiki") + ; 32-bit is not supported: https://github.com/facebook/folly/issues/103 + (supported-systems '("aarch64" "x86_64-linux")) + (license license:asl2.0))) diff --git a/gnu/packages/patches/folly-add-missing-include.patch b/gnu/packages/patches/folly-add-missing-include.patch new file mode 100644 index 0000000000..929239233f --- /dev/null +++ b/gnu/packages/patches/folly-add-missing-include.patch @@ -0,0 +1,10 @@ +--- a/folly/concurrency/test/AtomicSharedPtrTest.cpp ++++ b/folly/concurrency/test/AtomicSharedPtrTest.cpp +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #include +