[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
26/28: gnu: Boost: Update to 1.72.0.
From: |
guix-commits |
Subject: |
26/28: gnu: Boost: Update to 1.72.0. |
Date: |
Wed, 8 Jan 2020 15:58:50 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 02fef9619bd96086aa9255ffb0944d4cda617c84
Author: Marius Bakke <address@hidden>
AuthorDate: Wed Jan 8 19:03:12 2020 +0100
gnu: Boost: Update to 1.72.0.
* gnu/packages/patches/boost-dumpversion.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/boost.scm (boost): Update to 1.72.0.
[source](uri): Remove defunct mirror.
[source](patches): Remove.
[arguments]: Adjust /bin/sh substitutions. Remove obsolete workaround.
---
gnu/local.mk | 1 -
gnu/packages/boost.scm | 25 ++++++++-----------------
gnu/packages/patches/boost-dumpversion.patch | 24 ------------------------
3 files changed, 8 insertions(+), 42 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index e2b605e..2a60a8d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -750,7 +750,6 @@ dist_patch_DATA =
\
%D%/packages/patches/binutils-loongson-workaround.patch \
%D%/packages/patches/blender-2.79-newer-ffmpeg.patch \
%D%/packages/patches/blender-2.79-python-3.7-fix.patch \
- %D%/packages/patches/boost-dumpversion.patch \
%D%/packages/patches/byobu-writable-status.patch \
%D%/packages/patches/calibre-no-updates-dialog.patch \
%D%/packages/patches/calibre-remove-test-bs4.patch \
diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index 3665dcc..1f896d3 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -12,6 +12,7 @@
;;; Copyright © 2018 Efraim Flashner <address@hidden>
;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
;;; Copyright © 2019 Giacomo Leidi <address@hidden>
+;;; Copyright © 2020 Marius Bakke <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -46,21 +47,17 @@
(define-public boost
(package
(name "boost")
- (version "1.70.0")
+ (version "1.72.0")
(source (origin
(method url-fetch)
(uri (let ((version-with-underscores
(string-map (lambda (x) (if (eq? x #\.) #\_ x))
version)))
- (list (string-append "mirror://sourceforge/boost/boost/"
version
- "/boost_" version-with-underscores
".tar.bz2")
- (string-append
"https://dl.bintray.com/boostorg/release/"
- version "/source/boost_"
- version-with-underscores
".tar.bz2"))))
- (patches
- (search-patches "boost-dumpversion.patch"))
+ (string-append "https://dl.bintray.com/boostorg/release/"
+ version "/source/boost_"
+ version-with-underscores ".tar.bz2")))
(sha256
(base32
- "0y47nc7w0arwgj4x1phadxbvl7wyfcgknbz5kv8lzpl98wsyh2j3"))))
+ "08h7cv61fd0lzb4z50xanfqn0pdgvizjrpd1kcdgj725pisb5jar"))))
(build-system gnu-build-system)
(inputs `(("icu4c" ,icu4c)
("zlib" ,zlib)))
@@ -75,11 +72,6 @@
#:make-flags
(list "threading=multi" "link=shared"
- ;; XXX: Disable installation of Boosts modular CMake config
scripts
- ;; which conflicts in 1.70.0 with the ones provided by CMake.
- ;; See <https://bugs.gnu.org/36721>.
- "--no-cmake-config"
-
;; Set the RUNPATH to $libdir so that the libs find each other.
(string-append "linkflags=-Wl,-rpath="
(assoc-ref %outputs "out") "/lib")
@@ -109,9 +101,8 @@
(out (assoc-ref outputs "out")))
(substitute* '("libs/config/configure"
"libs/spirit/classic/phoenix/test/runtest.sh"
- "tools/build/src/engine/execunix.c"
- "tools/build/src/engine/Jambase"
- "tools/build/src/engine/jambase.c")
+ "tools/build/src/engine/execunix.cpp"
+ "tools/build/src/engine/Jambase")
(("/bin/sh") (which "sh")))
(setenv "SHELL" (which "sh"))
diff --git a/gnu/packages/patches/boost-dumpversion.patch
b/gnu/packages/patches/boost-dumpversion.patch
deleted file mode 100644
index 7df779c..0000000
--- a/gnu/packages/patches/boost-dumpversion.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-This issue is described here: https://github.com/openwrt/packages/pull/8685
-and has not been solved as of 1.70.0 release.
-
---- a/tools/build/src/tools/common.jam
-+++ b/tools/build/src/tools/common.jam
-@@ -973,18 +973,6 @@
- }
- }
-
-- # From GCC 5, versioning changes and minor becomes patch
-- if $(tag) = gcc && [ numbers.less 4 $(version[1]) ]
-- {
-- version = $(version[1]) ;
-- }
--
-- # Ditto, from Clang 4
-- if ( $(tag) = clang || $(tag) = clangw ) && [ numbers.less 3
$(version[1]) ]
-- {
-- version = $(version[1]) ;
-- }
--
- # On intel, version is not added, because it does not matter and it is the
- # version of vc used as backend that matters. Ideally, we should encode
the
- # backend version but that would break compatibility with V1.
- 04/28: gnu: WebkitGTK: Fix build failure with ICU 65., (continued)
- 04/28: gnu: WebkitGTK: Fix build failure with ICU 65., guix-commits, 2020/01/08
- 15/28: gnu: cURL: Update to 7.68.0., guix-commits, 2020/01/08
- 13/28: gnu: libXpm: Update to 3.5.13., guix-commits, 2020/01/08
- 14/28: gnu: CMake: Update to 3.16.2., guix-commits, 2020/01/08
- 18/28: gnu: libarchive: Update to 3.4.1., guix-commits, 2020/01/08
- 21/28: gnu: RHash: Do not use unstable source tarball., guix-commits, 2020/01/08
- 20/28: gnu: meson: Update to 0.53.0., guix-commits, 2020/01/08
- 19/28: gnu: libjpeg-turbo: Update to 2.0.4., guix-commits, 2020/01/08
- 24/28: gnu: libpaper: Do not build the static library., guix-commits, 2020/01/08
- 25/28: gnu: teckit: Do not build the static library., guix-commits, 2020/01/08
- 26/28: gnu: Boost: Update to 1.72.0.,
guix-commits <=
- 17/28: gnu: mit-krb5: Update to 1.17.1., guix-commits, 2020/01/08
- 16/28: gnu: fribidi: Update to 1.0.8., guix-commits, 2020/01/08
- 23/28: gnu: doxygen: Update to 1.8.17., guix-commits, 2020/01/08
- 27/28: gnu: Boost: Use Python 3 by default., guix-commits, 2020/01/08
- 28/28: gnu: vigra: Build with Python 3., guix-commits, 2020/01/08
- 22/28: gnu: RHash: Update to 1.3.9., guix-commits, 2020/01/08