guix-commits
[Top][All Lists]
Advanced

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

16/34: gnu: boost: Update to 1.76.0.


From: guix-commits
Subject: 16/34: gnu: boost: Update to 1.76.0.
Date: Sat, 22 May 2021 11:16:30 -0400 (EDT)

mbakke pushed a commit to branch core-updates
in repository guix.

commit b08d989045450c72260e3781ef458555b9e2597c
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun May 16 11:32:39 2021 +0200

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

diff --git a/gnu/local.mk b/gnu/local.mk
index 7fc1599..e08f581 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -879,7 +879,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 c6cf452..e9da56e 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 a42feab..0000000
--- 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
- 



reply via email to

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