guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/11: gnu: folly: Remove reference to missing patch.


From: guix-commits
Subject: 01/11: gnu: folly: Remove reference to missing patch.
Date: Sat, 10 Oct 2020 17:40:45 -0400 (EDT)

mbakke pushed a commit to branch master
in repository guix.

commit 9ac212cbae933d0520e6e09bd7e33d82e7102df6
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat Oct 10 23:16:06 2020 +0200

    gnu: folly: Remove reference to missing patch.
    
    The patch is unnecessary because tests are disabled.
    This is a follow-up to 5b548a1ee45bb12111af50cf00eb696207e207c5.
    
    * gnu/packages/cpp.scm (folly)[source](patches): Remove.
    * gnu/local.mk (dist_patch_DATA): Remove missing patch.
---
 gnu/local.mk         | 1 -
 gnu/packages/cpp.scm | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 8722b43..b59b122 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -966,7 +966,6 @@ 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 da3ea8e..f51e832 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -692,8 +692,7 @@ standard GNU style syntax for options.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0q4w4cvjxffc462hvs8h4zryq4965j7015zvkwagcm6cj6wmz3cn"))
-              (patches (search-patches "folly-add-missing-include.patch"))))
+                "0q4w4cvjxffc462hvs8h4zryq4965j7015zvkwagcm6cj6wmz3cn"))))
     (build-system cmake-build-system)
     (arguments
      '(;; Tests must be explicitly enabled



reply via email to

[Prev in Thread] Current Thread [Next in Thread]