From patchwork Fri Sep 25 18:13:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 24300 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 B475227BBE8; Fri, 25 Sep 2020 19:15:20 +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 CFC5027BBE9 for ; Fri, 25 Sep 2020 19:15:16 +0100 (BST) Received: from localhost ([::1]:53858 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLsFY-0005Ah-27 for patchwork@mira.cbaines.net; Fri, 25 Sep 2020 14:15:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLsFK-0005AL-7H for guix-patches@gnu.org; Fri, 25 Sep 2020 14:15:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33773) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLsFJ-0004kp-Si for guix-patches@gnu.org; Fri, 25 Sep 2020 14:15:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kLsFJ-0005t9-PB for guix-patches@gnu.org; Fri, 25 Sep 2020 14:15: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: Fri, 25 Sep 2020 18:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 43620 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43620@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160105764922551 (code B ref -1); Fri, 25 Sep 2020 18:15:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Sep 2020 18:14:09 +0000 Received: from localhost ([127.0.0.1]:45319 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLsES-0005rf-KS for submit@debbugs.gnu.org; Fri, 25 Sep 2020 14:14:09 -0400 Received: from lists.gnu.org ([209.51.188.17]:48068) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLsEP-0005rW-9o for submit@debbugs.gnu.org; Fri, 25 Sep 2020 14:14:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLsEO-0004u9-9M for guix-patches@gnu.org; Fri, 25 Sep 2020 14:14:05 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:39209) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLsEF-0004eG-Li for guix-patches@gnu.org; Fri, 25 Sep 2020 14:14:03 -0400 Received: by mail-wr1-x441.google.com with SMTP id k10so1522590wru.6 for ; Fri, 25 Sep 2020 11:13:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=TsKdXQ9Ck0zUKV3SFFjyXuxkVCfqhAfpgMvin+/YJGA=; b=UKXtOJl0qcBaJxziSz0ah3P2I67ZY6cUpGnXWKpVx1x9nAA5GFuIJo0OliNPlX4S4n Mozq57ycCaFujR8vudSHdpp8hL4EGW/CE2n4J4ezGs48N6LZeBdnGPtfzBdS5NDpD4fr Sqx6WAbTm7LrcD2HQcjKFi1prNF+FVqDFr3WgONdgXMskmYTzUYI/TaUJdixd2yJFgBQ 7fMu3ff0gNK63xcvE773CpTElWTZZz8MAEeY7l4Hges63isXm6BhW/yIJ/AyzZ8Tiy8e 23YtioMUbkvRUVgkwfPxqpeVi5tEnflLjXBsBkn961STCkIm38XwvnkwUxvKUnUca+Pc UnnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=TsKdXQ9Ck0zUKV3SFFjyXuxkVCfqhAfpgMvin+/YJGA=; b=S96YoYeXjt7yNEYq4aH2L3/iAET/6124QLuErxs1Nb9qrbixNp1fl9EJZYnMDO6tUy j0Wolvx81PdkwGtmkagrbkDRZdTz0KgXG9JkYnpSxHV97sEzL3Zr06XmI2x+JD2vWcBA VnMiiKQl4DtDxSTIbhX/8zdyttKRGdNoW9UqTFOK+G8rEF4iqoz4WJPoxUjhr7e50z76 H80qaWXJDbDbHdqWOOT/Iz4hTXcBdy6WV+aoqRziWSL7ncpiuv2lGIc9I9IEgJGfwvFv W5aj+If+vyx3sMjY68B5KreMI21PaZ/oDqcnNlisZVcp9v+w0M/sTxKE0/tUauUWctlB q5wA== X-Gm-Message-State: AOAM532mQYs28dtqxT4WEkmoXcz2r/1Mucie1JlJyZyiS9GI5dngkKoC Lmf6tOd5gJ/5fyewXIR/1SJ4O/CcnoX3Z43cOZUFj4zJLaaUauVK1Os= X-Google-Smtp-Source: ABdhPJwMkX87BSiSqmbSZaSj0J0VGpH+h81YV0GI23DRLGZOhMa9F4t+jwCHp80FK/6EZ6jsK2Y8Hd1Nm2yF2mczPII= X-Received: by 2002:a5d:6283:: with SMTP id k3mr5991320wru.191.1601057633871; Fri, 25 Sep 2020 11:13:53 -0700 (PDT) MIME-Version: 1.0 From: Greg Hogan Date: Fri, 25 Sep 2020 14:13:40 -0400 Message-ID: Received-SPF: none client-ip=2a00:1450:4864:20::441; envelope-from=code@greghogan.com; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 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" X-getmail-retrieved-from-mailbox: Patches This patch depends on #43619 From 2835c2ac08db9b5887bcc33a3c15e84f26111864 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 22 Sep 2020 15:22:32 +0000 Subject: [PATCH 2/2] gnu: Add folly. * gnu/packages/cpp.scm (folly): New variable. --- gnu/local.mk | 1 + gnu/packages/cpp.scm | 73 +++++++++++++++++++ .../patches/folly-add-missing-include.patch | 10 +++ 3 files changed, 84 insertions(+) create mode 100644 gnu/packages/patches/folly-add-missing-include.patch diff --git a/gnu/local.mk b/gnu/local.mk index 99e9b5a6ab..6f62493ff2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -964,6 +964,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 90e139e9eb..277f9da115 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -41,12 +41,23 @@ #: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 liburing) + #: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 +680,65 @@ 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.09.21.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 + "0ppd02scbi4a52s99par4i17cys4z8gangpxa86yma48k72z5xvs")) + (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 "An open-source C++ library developed and used at Facebook") + (description + "Folly (acronymed loosely after Facebook Open Source Library) is a library + of C++14 components designed with practicality and efficiency in mind. Folly + contains a variety of core library components used extensively at Facebook. In + particular, it's often a dependency of Facebook's other open source C++ efforts + and place where those projects can share code. + + It complements (as opposed to competing against) offerings such as Boost and of + course std. In fact, we embark on defining our own component only when + something we need is either not available, or does not meet the needed + performance profile. We endeavor to remove things from folly if or when std or + Boost obsoletes them. + + Performance concerns permeate much of Folly, sometimes leading to designs that + are more idiosyncratic than they would otherwise be (see e.g. PackedSyncPtr.h, + SmallLocks.h). Good performance at large scale is a unifying theme in all of Folly.") + (home-page "https://github.com/facebook/folly/wiki") + (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 +