From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 25 14:14:09 2020 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: Subject: [PATCH 2/2] gnu: Add folly. To: guix-patches@gnu.org Content-Type: multipart/alternative; boundary="0000000000008842f205b0274775" 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-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --0000000000008842f205b0274775 Content-Type: text/plain; charset="UTF-8" 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 + -- 2.28.0 --0000000000008842f205b0274775 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
This patch depends on #43619

=
From 2835c2ac08db9b5887bcc33a3c15e84f26111864 Mon Sep 17 00:00:00 2001=
From: Greg Hogan <code@gregh= ogan.com>
Date: Tue, 22 Sep 2020 15:22:32 +0000
Subject: [PATC= H 2/2] gnu: Add folly.

* gnu/packages/cpp.scm (folly): New variable.=
---
=C2=A0gnu/local.mk =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| =C2=A01 +
=C2=A0gnu/packages/cpp.scm = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0| 73 +++++++++++++++++++
=C2=A0.../patches/folly-add-mi= ssing-include.patch =C2=A0 | 10 +++
=C2=A03 files changed, 84 insertions= (+)
=C2=A0create mode 100644 gnu/packages/patches/folly-add-missing-incl= ude.patch

diff --git a/gnu/local.mk = b/gnu/local.mk
index 99e9b5a6ab..6f62493= ff2 100644
--- a/gnu/local.mk
+++ b/g= nu/local.mk
@@ -964,6 +964,7 @@ dist_pat= ch_DATA =3D =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 \
=C2=A0 =C2=A0%D%/packages/patches/findutils-localstatedir.p= atch =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 \
=C2=A0 =C2=A0%D%/packages/patc= hes/findutils-test-rwlock-threads.patch =C2=A0 =C2=A0 \
=C2=A0 =C2=A0%D%= /packages/patches/flann-cmake-3.11.patch =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0\
+ =C2=A0%D%/packages/patches/folly-add-mis= sing-include.patch =C2=A0 =C2=A0 =C2=A0 =C2=A0 \
=C2=A0 =C2=A0%D%/packag= es/patches/foobillard++-pkg-config.patch =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= \
=C2=A0 =C2=A0%D%/packages/patches/foomatic-filters-CVE-2015-8327.patc= h =C2=A0 =C2=A0\
=C2=A0 =C2=A0%D%/packages/patches/foomatic-filters-CVE-= 2015-8560.patch =C2=A0 =C2=A0\
diff --git a/gnu/packages/cpp.scm b/gnu/p= ackages/cpp.scm
index 90e139e9eb..277f9da115 100644
--- a/gnu/package= s/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -41,12 +41,23 @@
=C2=A0 = =C2=A0#:use-module (guix build-system python)
=C2=A0 =C2=A0#:use-module = (gnu packages)
=C2=A0 =C2=A0#:use-module (gnu packages autotools)
+ = =C2=A0#:use-module (gnu packages boost)
=C2=A0 =C2=A0#:use-module (gnu p= ackages check)
=C2=A0 =C2=A0#:use-module (gnu packages code)
=C2=A0 = =C2=A0#:use-module (gnu packages compression)
+ =C2=A0#:use-module (gnu = packages crypto)
+ =C2=A0#:use-module (gnu packages gcc)
+ =C2=A0#:us= e-module (gnu packages libevent)
+ =C2=A0#:use-module (gnu packages libu= nwind)
+ =C2=A0#:use-module (gnu packages liburing)
+ =C2=A0#:use-mod= ule (gnu packages linux)
=C2=A0 =C2=A0#:use-module (gnu packages llvm)+ =C2=A0#:use-module (gnu packages logging)
+ =C2=A0#:use-module (gnu = packages maths)
=C2=A0 =C2=A0#:use-module (gnu packages perl)
=C2=A0 = =C2=A0#:use-module (gnu packages pkg-config)
+ =C2=A0#:use-module (gnu p= ackages popt)
+ =C2=A0#:use-module (gnu packages pretty-print)
=C2=A0= =C2=A0#:use-module (gnu packages tls)
=C2=A0 =C2=A0#:use-module (gnu pa= ckages web))
=C2=A0
@@ -669,3 +680,65 @@ parsers according to a Parsi= ng Expression Grammar (PEG).")
=C2=A0standard GNU style syntax for = options.")
=C2=A0 =C2=A0 =C2=A0(home-page "https://github.com/jarro2783/cxxopts/wik= i")
=C2=A0 =C2=A0 =C2=A0(license license:expat)))
+
+(def= ine-public folly
+ =C2=A0(package
+ =C2=A0 =C2=A0(name "folly&qu= ot;)
+ =C2=A0 =C2=A0(version "2020.09.21.00")
+ =C2=A0 =C2= =A0(source (origin
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(me= thod git-fetch)
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(uri (= git-reference
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0(url "https= ://github.com/facebook/folly")
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(commit (string-append "v&quo= t; version))))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(file-n= ame (git-file-name name version))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0(sha256
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = (base32
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"0= ppd02scbi4a52s99par4i17cys4z8gangpxa86yma48k72z5xvs"))
+ =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(patches (search-patches "folly-= add-missing-include.patch"))))
+ =C2=A0 =C2=A0(build-system cmake-b= uild-system)
+ =C2=A0 =C2=A0(arguments
+ =C2=A0 =C2=A0 '(;; Tests= must be explicitly enabled
+ =C2=A0 =C2=A0 =C2=A0 ;#:configure-flags+ =C2=A0 =C2=A0 =C2=A0 ;'("-DBUILD_TESTS=3DON")))
+ =C2= =A0 =C2=A0 =C2=A0 ;; Leave tests disabled; see https://github.com/facebook/folly/issues/1456=
+ =C2=A0 =C2=A0 =C2=A0 #:tests? #f))
+ =C2=A0 =C2=A0(propagated-= inputs
+ =C2=A0 =C2=A0 `(("boost" ,boost)
+ =C2=A0 =C2=A0 = =C2=A0 ("gflags" ,gflags)
+ =C2=A0 =C2=A0 =C2=A0 ("glog&q= uot; ,glog)
+ =C2=A0 =C2=A0 =C2=A0 ("liburing" ,liburing)))+ =C2=A0 =C2=A0(inputs
+ =C2=A0 =C2=A0 `(("bzip2" ,bzip2)
= + =C2=A0 =C2=A0 =C2=A0 ("double-conversion" ,double-conversion)+ =C2=A0 =C2=A0 =C2=A0 ("fmt" ,fmt)
+ =C2=A0 =C2=A0 =C2=A0 (= "libaio" ,libaio)
+ =C2=A0 =C2=A0 =C2=A0 ("libevent"= ,libevent)
+ =C2=A0 =C2=A0 =C2=A0 ("libiberty" ,libiberty)+ =C2=A0 =C2=A0 =C2=A0 ("libsodium" ,libsodium)
+ =C2=A0 =C2= =A0 =C2=A0 ("libunwind" ,libunwind)
+ =C2=A0 =C2=A0 =C2=A0 (&q= uot;lz4" ,lz4)
+ =C2=A0 =C2=A0 =C2=A0 ("openssl" ,openssl= )
+ =C2=A0 =C2=A0 =C2=A0 ("snappy" ,snappy)
+ =C2=A0 =C2=A0= =C2=A0 ("zlib" ,zlib)
+ =C2=A0 =C2=A0 =C2=A0 ("zstd"= ; ,zstd "lib")))
+ =C2=A0 =C2=A0(native-inputs
+ =C2=A0 =C2= =A0 `(("googletest" ,googletest)))
+ =C2=A0 =C2=A0(synopsis &q= uot;An open-source C++ library developed and used at Facebook")
+ = =C2=A0 =C2=A0(description
+ =C2=A0 =C2=A0 "Folly (acronymed loosely= after Facebook Open Source Library) is a library
+ =C2=A0of C++14 compo= nents designed with practicality and efficiency in mind. Folly
+ =C2=A0c= ontains a variety of core library components used extensively at Facebook. = In
+ =C2=A0particular, it's often a dependency of Facebook's oth= er open source C++ efforts
+ =C2=A0and place where those projects can sh= are code.
+
+ =C2=A0It complements (as opposed to competing against) = offerings such as Boost and of
+ =C2=A0course std. In fact, we embark on= defining our own component only when
+ =C2=A0something we need is eithe= r not available, or does not meet the needed
+ =C2=A0performance profile= . We endeavor to remove things from folly if or when std or
+ =C2=A0Boos= t obsoletes them.
+
+ =C2=A0Performance concerns permeate much of Fol= ly, sometimes leading to designs that
+ =C2=A0are more idiosyncratic tha= n they would otherwise be (see e.g. PackedSyncPtr.h,
+ =C2=A0SmallLocks.= h). Good performance at large scale is a unifying theme in all of Folly.&qu= ot;)
+ =C2=A0 =C2=A0(home-page "https://github.com/facebook/folly/wiki")
+ =C2= =A0 =C2=A0(license license:asl2.0)))
diff --git a/gnu/packages/patches/f= olly-add-missing-include.patch b/gnu/packages/patches/folly-add-missing-inc= lude.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 <folly/concurrency/AtomicSharedPtr.h>
+ #include &= lt;folly/concurrency/test/AtomicSharedPtrCounted.h>
+ #include <fo= lly/portability/GTest.h>
++#include <folly/portability/GFlags.h>= ;
+
+ #include <folly/test/DeterministicSchedule.h>
+
-= -
2.28.0
--0000000000008842f205b0274775-- From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 29 16:46:35 2020 Received: (at 43620) by debbugs.gnu.org; 29 Sep 2020 20:46:35 +0000 Received: from localhost ([127.0.0.1]:57300 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNMWA-0008O6-Vb for submit@debbugs.gnu.org; Tue, 29 Sep 2020 16:46:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58788) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNMW9-0008Nq-3D for 43620@debbugs.gnu.org; Tue, 29 Sep 2020 16:46:33 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:47361) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNMW3-0007NT-MO; Tue, 29 Sep 2020 16:46:27 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=57474 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kNMW3-0003wU-5Y; Tue, 29 Sep 2020 16:46:27 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Greg Hogan Subject: Re: [bug#43620] [PATCH 2/2] gnu: Add folly. References: Date: Tue, 29 Sep 2020 22:46:24 +0200 In-Reply-To: (Greg Hogan's message of "Fri, 25 Sep 2020 14:13:40 -0400") Message-ID: <87r1qk48gv.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 43620 Cc: 43620@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Greg Hogan skribis: >>>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. [...] > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > + "0ppd02scbi4a52s99par4i17cys4z8gangpxa86yma48k72z5xvs")) > + (patches (search-patches > "folly-add-missing-include.patch")))) Looks like your mail client mangled the patch. > + (synopsis "An open-source C++ library developed and used at Facebook= ") Everything is free software in here, no need to write it. Also, please remove the initial article and somehow say what the library provides in terms of features: https://guix.gnu.org/manual/en/html_node/Synopses-and-Descriptions.html > + (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 Boo= st > 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.") I=E2=80=99d strip all but one reference to Facebook, we=E2=80=99re not an a= dvertising project. :-) Nitpick: please remove =E2=80=9Copen source=E2=80=9D, avoid marketing terms (=E2=80=9Ccompeting=E2=80=9D, =E2=80=9Cofferings=E2=80=9D, etc.), write @co= de{std}, @file{SmallLocks.h} and similar. Could you send an updated patch? Thank you! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 10 12:50:42 2020 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: Subject: Re: [bug#43620] [PATCH 2/2] gnu: Add folly. To: =?UTF-8?Q?Ludovic_Court=C3=A8s?= Content-Type: multipart/alternative; boundary="000000000000b28d7505b153dc2e" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 43620 Cc: 43620@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --000000000000b28d7505b153dc2e Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 =3D \ %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=3DON"))) + ;; 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/10= 3 + (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 + --=20 2.28.0 On Tue, Sep 29, 2020 at 4:46 PM Ludovic Court=C3=A8s wrote: > Greg Hogan skribis: > > >>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. > > [...] > > > + (file-name (git-file-name name version)) > > + (sha256 > > + (base32 > > + "0ppd02scbi4a52s99par4i17cys4z8gangpxa86yma48k72z5xvs"= )) > > + (patches (search-patches > > "folly-add-missing-include.patch")))) > > Looks like your mail client mangled the patch. > > > + (synopsis "An open-source C++ library developed and used at > Facebook") > > Everything is free software in here, no need to write it. Also, please > remove the initial article and somehow say what the library provides in > terms of features: > > https://guix.gnu.org/manual/en/html_node/Synopses-and-Descriptions.html > > > + (description > > + "Folly (acronymed loosely after Facebook Open Source Library) is = a > > library > > + of C++14 components designed with practicality and efficiency in min= d. > > 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 wh= en > > + something we need is either not available, or does not meet the need= ed > > + 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 i= n > > all of Folly.") > > I=E2=80=99d strip all but one reference to Facebook, we=E2=80=99re not an= advertising > project. :-) > > Nitpick: please remove =E2=80=9Copen source=E2=80=9D, avoid marketing ter= ms > (=E2=80=9Ccompeting=E2=80=9D, =E2=80=9Cofferings=E2=80=9D, etc.), write @= code{std}, @file{SmallLocks.h} > and similar. > > Could you send an updated patch? > > Thank you! > > Ludo=E2=80=99. > --000000000000b28d7505b153dc2e Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
This patch depends = on #43619

Reworded synopsis=C2=A0and descripti= on. Updated to newest version. Limited to 64-bit architectures.
<= br>
From 8e3df10ad8aa791e34a5a5abcaabe0438f7b063a Mon Sep 17 00:0= 0:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Tue, 22 Sep 2020 15:22:32 +0= 000
Subject: [PATCH] gnu: Add folly.

* g= nu/packages/cpp.scm (folly): New variable.
---
=C2=A0gn= u/local.mk =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0| =C2=A01 +
=C2=A0gnu/packages/cpp.scm =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0| 61 +++++++++++++++++++
=C2=A0.../patches/folly-add-missing-i= nclude.patch =C2=A0 | 10 +++
=C2=A03 files changed, 72 insertions= (+)
=C2=A0create mode 100644 gnu/packages/patches/folly-add-missi= ng-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 =3D \
=C2=A0 =C2=A0%D%/packages/patches/findutils-localstatedir.patch \
= =C2=A0 =C2=A0%D%/packages/patches/findutils-test-rwlock-threads.patch \
=C2=A0 =C2=A0%D%/packages/patches/flann-cmake-3.11.patch \
+ =C2= =A0%D%/packages/patches/folly-add-missing-include.patch \
=C2=A0 =C2= =A0%D%/packages/patches/foobillard++-pkg-config.patch \
=C2=A0 =C2=A0= %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \
=C2=A0 =C2= =A0%D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \
diff --= git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index d3daae74c= 0..680a2ad520 100644
--- a/gnu/packages/cpp.scm
+++ b/g= nu/packages/cpp.scm
@@ -41,12 +41,22 @@
=C2=A0 =C2=A0#:= use-module (guix build-system python)
=C2=A0 =C2=A0#:use-module (= gnu packages)
=C2=A0 =C2=A0#:use-module (gnu packages autotools)<= /div>
+ =C2=A0#:use-module (gnu packages boost)
=C2=A0 =C2=A0= #:use-module (gnu packages check)
=C2=A0 =C2=A0#:use-module (gnu = packages code)
=C2=A0 =C2=A0#:use-module (gnu packages compressio= n)
+ =C2=A0#:use-module (gnu packages crypto)
+ =C2=A0#= :use-module (gnu packages gcc)
+ =C2=A0#:use-module (gnu packages= libevent)
+ =C2=A0#:use-module (gnu packages libunwind)
+ =C2=A0#:use-module (gnu packages linux)
=C2=A0 =C2=A0#:use-mo= dule (gnu packages llvm)
+ =C2=A0#:use-module (gnu packages loggi= ng)
+ =C2=A0#:use-module (gnu packages maths)
=C2=A0 = =C2=A0#:use-module (gnu packages perl)
=C2=A0 =C2=A0#:use-module = (gnu packages pkg-config)
+ =C2=A0#:use-module (gnu packages popt= )
+ =C2=A0#:use-module (gnu packages pretty-print)
=C2= =A0 =C2=A0#:use-module (gnu packages tls)
=C2=A0 =C2=A0#:use-modu= le (gnu packages web))
=C2=A0
@@ -669,3 +679,54 @@ pars= ers according to a Parsing Expression Grammar (PEG).")
=C2= =A0standard GNU style syntax for options.")
=C2=A0 =C2=A0 = =C2=A0(home-page "https://github.com/jarro2783/cxxopts/wiki")
=C2=A0 =C2= =A0 =C2=A0(license license:expat)))
+
+(define-public f= olly
+ =C2=A0(package
+ =C2=A0 =C2=A0(name "folly&= quot;)
+ =C2=A0 =C2=A0(version "2020.10.05.00")
+ =C2=A0 =C2=A0(source (origin
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0(method git-fetch)
+ =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0(uri (git-reference
+ =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(url "https://github.com/facebook/folly&quo= t;)
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0(commit (string-append "v" version))))
+ =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(file-name (git-file-name name= version))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(sha= 256
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (base32
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"0q4w= 4cvjxffc462hvs8h4zryq4965j7015zvkwagcm6cj6wmz3cn"))
+ =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(patches (search-patches "fo= lly-add-missing-include.patch"))))
+ =C2=A0 =C2=A0(build-sys= tem cmake-build-system)
+ =C2=A0 =C2=A0(arguments
+ =C2= =A0 =C2=A0 '(;; Tests must be explicitly enabled
+ =C2=A0 =C2= =A0 =C2=A0 ;#:configure-flags
+ =C2=A0 =C2=A0 =C2=A0 ;'("= ;-DBUILD_TESTS=3DON")))
+ =C2=A0 =C2=A0 =C2=A0 ;; Leave test= s disabled; see h= ttps://github.com/facebook/folly/issues/1456
+ =C2=A0 =C2=A0 = =C2=A0 #:tests? #f))
+ =C2=A0 =C2=A0(propagated-inputs
= + =C2=A0 =C2=A0 `(("boost" ,boost)
+ =C2=A0 =C2=A0 =C2= =A0 ("gflags" ,gflags)
+ =C2=A0 =C2=A0 =C2=A0 ("gl= og" ,glog)
+ =C2=A0 =C2=A0 =C2=A0 ("liburing" ,lib= uring)))
+ =C2=A0 =C2=A0(inputs
+ =C2=A0 =C2=A0 `((&quo= t;bzip2" ,bzip2)
+ =C2=A0 =C2=A0 =C2=A0 ("double-conver= sion" ,double-conversion)
+ =C2=A0 =C2=A0 =C2=A0 ("fmt&= quot; ,fmt)
+ =C2=A0 =C2=A0 =C2=A0 ("libaio" ,libaio)
+ =C2=A0 =C2=A0 =C2=A0 ("libevent" ,libevent)
= + =C2=A0 =C2=A0 =C2=A0 ("libiberty" ,libiberty)
+ =C2= =A0 =C2=A0 =C2=A0 ("libsodium" ,libsodium)
+ =C2=A0 =C2= =A0 =C2=A0 ("libunwind" ,libunwind)
+ =C2=A0 =C2=A0 =C2= =A0 ("lz4" ,lz4)
+ =C2=A0 =C2=A0 =C2=A0 ("openssl&= quot; ,openssl)
+ =C2=A0 =C2=A0 =C2=A0 ("snappy" ,snapp= y)
+ =C2=A0 =C2=A0 =C2=A0 ("zlib" ,zlib)
+ = =C2=A0 =C2=A0 =C2=A0 ("zstd" ,zstd "lib")))
+= =C2=A0 =C2=A0(native-inputs
+ =C2=A0 =C2=A0 `(("googletest&= quot; ,googletest)))
+ =C2=A0 =C2=A0(synopsis "Collection of= C++ components complementing the standard library")
+ =C2= =A0 =C2=A0(description
+ =C2=A0 =C2=A0 "Folly (acronymed loo= sely after Facebook Open Source Library) is a library
+of C++14 c= omponents which complements @code{std} and Boost.")
+ =C2=A0= =C2=A0(home-page "= https://github.com/facebook/folly/wiki")
+ =C2=A0 =C2=A0= ; 32-bit is not supported: https://github.com/facebook/folly/issues/103
+ =C2= =A0 =C2=A0(supported-systems '("aarch64" "x86_64-linux&q= uot;))
+ =C2=A0 =C2=A0(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,1= 0 @@
+--- a/folly/concurrency/test/AtomicSharedPtrTest.cpp
<= div>++++ b/folly/concurrency/test/AtomicSharedPtrTest.cpp
+@@ -27= ,6 +27,7 @@
+ #include <folly/concurrency/AtomicSharedPtr.h>= ;
+ #include <folly/concurrency/test/AtomicSharedPtrCounted.h&= gt;
+ #include <folly/portability/GTest.h>
++#inc= lude <folly/portability/GFlags.h>
+=C2=A0
+ #incl= ude <folly/test/DeterministicSchedule.h>
+=C2=A0
= --=C2=A0
2.28.0

On Tue, Sep 29, 2020 at 4:46 PM = Ludovic Court=C3=A8s <ludo@gnu.org&g= t; wrote:
Greg Hogan <code@greghogan.com> skribis:

>>From 2835c2ac08db9b5887bcc33a3c15e84f26111864 Mon Sep 17 00:00:00 2= 001
> From: Greg Hogan <code@greghogan.com>
> Date: Tue, 22 Sep 2020 15:22:32 +0000
> Subject: [PATCH 2/2] gnu: Add folly.
>
> * gnu/packages/cpp.scm (folly): New variable.

[...]

> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (file-name (git-file= -name name version))
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (sha256
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(base32
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "0ppd02s= cbi4a52s99par4i17cys4z8gangpxa86yma48k72z5xvs"))
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (patches (search-pat= ches
> "folly-add-missing-include.patch"))))

Looks like your mail client mangled the patch.

> +=C2=A0 =C2=A0 (synopsis "An open-source C++ library developed an= d used at Facebook")

Everything is free software in here, no need to write it.=C2=A0 Also, pleas= e
remove the initial article and somehow say what the library provides in
terms of features:

=C2=A0 https://guix.gnu.org/m= anual/en/html_node/Synopses-and-Descriptions.html

> +=C2=A0 =C2=A0 (description
> +=C2=A0 =C2=A0 =C2=A0"Folly (acronymed loosely after Facebook Ope= n Source Library) is a
> library
> +=C2=A0 of C++14 components designed with practicality and efficiency = in mind.
> Folly
> +=C2=A0 contains a variety of core library components used extensively= at
> Facebook. In
> +=C2=A0 particular, it's often a dependency of Facebook's othe= r open source C++
> efforts
> +=C2=A0 and place where those projects can share code.
> +
> +=C2=A0 It complements (as opposed to competing against) offerings suc= h as Boost
> and of
> +=C2=A0 course std. In fact, we embark on defining our own component o= nly when
> +=C2=A0 something we need is either not available, or does not meet th= e needed
> +=C2=A0 performance profile. We endeavor to remove things from folly i= f or when
> std or
> +=C2=A0 Boost obsoletes them.
> +
> +=C2=A0 Performance concerns permeate much of Folly, sometimes leading= to
> designs that
> +=C2=A0 are more idiosyncratic than they would otherwise be (see e.g.<= br> > PackedSyncPtr.h,
> +=C2=A0 SmallLocks.h). Good performance at large scale is a unifying t= heme in
> all of Folly.")

I=E2=80=99d strip all but one reference to Facebook, we=E2=80=99re not an a= dvertising
project.=C2=A0 :-)

Nitpick: please remove =E2=80=9Copen source=E2=80=9D, avoid marketing terms=
(=E2=80=9Ccompeting=E2=80=9D, =E2=80=9Cofferings=E2=80=9D, etc.), write @co= de{std}, @file{SmallLocks.h}
and similar.

Could you send an updated patch?

Thank you!

Ludo=E2=80=99.
--000000000000b28d7505b153dc2e-- From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 10 17:00:00 2020 Received: (at 43620-done) by debbugs.gnu.org; 10 Oct 2020 21:00:00 +0000 Received: from localhost ([127.0.0.1]:38750 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kRLyC-0002iu-Jz for submit@debbugs.gnu.org; Sat, 10 Oct 2020 17:00:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48030) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kRLyA-0002if-3N for 43620-done@debbugs.gnu.org; Sat, 10 Oct 2020 16:59:59 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:42508) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kRLy4-0000qh-NX; Sat, 10 Oct 2020 16:59:52 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=48998 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kRLy4-0004SC-7V; Sat, 10 Oct 2020 16:59:52 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Greg Hogan Subject: Re: [bug#43620] [PATCH 2/2] gnu: Add folly. References: <87r1qk48gv.fsf@gnu.org> Date: Sat, 10 Oct 2020 22:59:50 +0200 In-Reply-To: (Greg Hogan's message of "Sat, 10 Oct 2020 12:50:15 -0400") Message-ID: <87k0vxhk55.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 43620-done Cc: 43620-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Greg Hogan skribis: >>>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. Applied with the changes below. Thanks! Ludo=E2=80=99. --=-=-= Content-Type: text/x-patch Content-Disposition: inline diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 7f52dc3772..da3ea8ec55 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -697,8 +697,7 @@ standard GNU style syntax for options.") (build-system cmake-build-system) (arguments '(;; Tests must be explicitly enabled - ;#:configure-flags - ;'("-DBUILD_TESTS=ON"))) + ;;#:configure-flags '("-DBUILD_TESTS=ON"))) ;; Leave tests disabled; see https://github.com/facebook/folly/issues/1456 #:tests? #f)) (propagated-inputs @@ -725,8 +724,8 @@ standard GNU style syntax for options.") (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.") +of C++14 components that 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")) + ;; 32-bit is not supported: https://github.com/facebook/folly/issues/103 + (supported-systems '("aarch64-linux" "x86_64-linux")) (license license:asl2.0))) --=-=-=-- From unknown Sat Jun 14 19:34:08 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 08 Nov 2020 12:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator