guix-patches
[Top][All Lists]
Advanced

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

[bug#48546] [PATCH] [core-updates] gnu: boost: Update to 1.76.0.


From: Greg Hogan
Subject: [bug#48546] [PATCH] [core-updates] gnu: boost: Update to 1.76.0.
Date: Thu, 20 May 2021 14:59:16 -0400

From 9cd911d33aa6a13b2c04f9bc0a9568fe0e19031a Mon Sep 17 00:00:00 2001
From: Greg Hogan <code@greghogan.com>
Date: Thu, 29 Apr 2021 10:45:49 +0000
Subject: [PATCH] gnu: boost: Update to 1.76.0.

* gnu/packages/boost.scm (boost): Update to 1.76.0.
[source]: Remove upstreamed patch.
* gnu/packages/patches/boost-fix-static-linking.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                     |  1 -
 gnu/packages/boost.scm                           |  6 ++----
 .../patches/boost-fix-transitive-linking.patch   | 16 ----------------
 3 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 gnu/packages/patches/boost-fix-transitive-linking.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index add01cf6d2..4c7ce2815f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -878,7 +878,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/blender-2.79-oiio2.patch                        \
   %D%/packages/patches/blender-2.79-python-3.7-fix.patch       \
   %D%/packages/patches/blender-2.79-python-3.8-fix.patch       \
-  %D%/packages/patches/boost-fix-transitive-linking.patch      \
   %D%/packages/patches/bpftrace-disable-bfd-disasm.patch       \
   %D%/packages/patches/byobu-writable-status.patch             \
   %D%/packages/patches/cairo-CVE-2018-19876.patch              \
diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index c6cf452f09..e9da56e115 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -66,17 +66,15 @@
 (define-public boost
   (package
     (name "boost")
-    (version "1.75.0")
+    (version "1.76.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://boostorg.jfrog.io/artifactory/main/release/"
                                   version "/source/boost_"
                                   (version-with-underscores version) ".tar.bz2"))
-              ; Should be included in next Boost update
-              (patches (search-patches "boost-fix-transitive-linking.patch"))
               (sha256
                (base32
-                "1js9zpij58l60kx46s3lxdp5207igppjnhqigwhbpdvd04gb6gcm"))))
+                "0hcc661savk32hx65997p0ss1awj6ala4cmz4w7lbi42x6k7nfgh"))))
     (build-system gnu-build-system)
     (inputs `(("icu4c" ,icu4c)
               ("zlib" ,zlib)))
diff --git a/gnu/packages/patches/boost-fix-transitive-linking.patch b/gnu/packages/patches/boost-fix-transitive-linking.patch
deleted file mode 100644
index a42feab109..0000000000
--- a/gnu/packages/patches/boost-fix-transitive-linking.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Patch from https://github.com/boostorg/boost_install/issues/47
-which should be included in the Boost 1.76 release.
-
-This patch prevents CMake from explicitly linking against Boost dependencies
-when building against the shared Boost libraries.
---- a/tools/boost_install/boost-install.jam
-+++ b/tools/boost_install/boost-install.jam
-@@ -483,7 +483,7 @@ rule generate-cmake-variant- ( target : sources * : properties * )
-
-     .info "  deps3=" $(deps3) ;
-
--    if $(deps3)
-+    if $(deps3) && $(link) = static
-     {
-         print.text
-
--
2.31.1

Attachment: 0001-gnu-boost-Update-to-1.76.0.patch
Description: Text Data


reply via email to

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