diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-02-09 21:11:00 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-02-09 21:11:00 +0100 |
| commit | ebbb7286b91e21cb26153e3d0a3ea8017cf16224 (patch) | |
| tree | c41eccbe937b0541109cc3b2d45c372ebf826755 /gnu/packages/boost.scm | |
| parent | d41f63942b5df85223f5fae110253bc30869653b (diff) | |
| parent | aefa29123feaf4202010675eae0a563b3ee90cf1 (diff) | |
| download | guix-ebbb7286b91e21cb26153e3d0a3ea8017cf16224.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/boost.scm')
| -rw-r--r-- | gnu/packages/boost.scm | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 26d0140fd0..8f5ac33700 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -44,16 +44,19 @@ (define-public boost (package (name "boost") - (version "1.68.0") + (version "1.69.0") (source (origin (method url-fetch) - (uri (string-append - "mirror://sourceforge/boost/boost/" version "/boost_" - (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version) - ".tar.bz2")) + (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")))) (sha256 (base32 - "1dyqsr9yb01y0nnjdq9b8q5s2kvhxbayk34832k5cpzn7jy30qbz")) + "01j4n142dz20lcgqji8d8hspp04p1nv7m8i6dz8w5lchfdhx8clg")) (patches (search-patches "boost-fix-icu-build.patch")))) (build-system gnu-build-system) (inputs `(("icu4c" ,icu4c) @@ -66,6 +69,7 @@ `(#:tests? #f #:make-flags (list "threading=multi" "link=shared" + "cxxflags=-std=c++14" ;; Set the RUNPATH to $libdir so that the libs find each other. (string-append "linkflags=-Wl,-rpath=" @@ -121,16 +125,6 @@ across a broad spectrum of applications.") (license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt" "Some components have other similar licences.")))) -;; Some programs need Boost to be built with C++14 support. -(define-public boost-cxx14 - (package (inherit boost) - (arguments - (substitute-keyword-arguments (package-arguments boost) - ((#:make-flags flags) - `(append ,flags - '("cxxflags=-std=c++14"))))) - (properties '((hidden? . #t))))) - (define-public boost-for-mysql ;; Older version for MySQL 5.7.23. (package |