From ca2c342181771b83d46a94aec9786f8dd0e0a0b8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 May 2018 06:39:40 +0200 Subject: gnu: boost: Update to 1.67.0. * gnu/packages/boost.scm (boost): Update to 1.67.0. --- gnu/packages/boost.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/boost.scm') diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 6b17e30a8e..6f96e55710 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -43,7 +43,7 @@ (define-public boost (package (name "boost") - (version "1.66.0") + (version "1.67.0") (source (origin (method url-fetch) (uri (string-append @@ -52,7 +52,7 @@ ".tar.bz2")) (sha256 (base32 - "1aaw48cmimsskzgiclwn0iifp62a5iw9cbqrhfari876af1828ap")) + "1fmdlmkzsrd46wwk834jsi2ypxj68w2by0rfcg2pzrafk5rck116")) (patches (search-patches "boost-fix-icu-build.patch")))) (build-system gnu-build-system) (inputs `(("icu4c" ,icu4c) -- cgit 1.4.1 From bd65ecf4608152d586be610add0c9d2ab2b4ac25 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 20:03:29 +0200 Subject: gnu: boost: Provide libboost_python compatibility symlink. * gnu/packages/boost.scm (boost)[arguments]: Add phase 'provide-libboost_python'. --- gnu/packages/boost.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'gnu/packages/boost.scm') diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index fbd0425c96..71b34ada1f 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -100,7 +100,18 @@ make-flags))) (replace 'install (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "./b2" "install" make-flags)))))) + (apply invoke "./b2" "install" make-flags))) + (add-after 'install 'provide-libboost_python + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; Boost can build support for both Python 2 and Python 3 since + ;; version 1.67.0, and suffixes each library with the Python + ;; version. Many consumers only check for libboost_python + ;; however, so we provide it here as suggested in + ;; . + (with-directory-excursion (string-append out "/lib") + (symlink "libboost_python27.so" "libboost_python.so")) + #t)))))) (home-page "https://www.boost.org") (synopsis "Peer-reviewed portable C++ source libraries") -- cgit 1.4.1 From 3ea66dadf6113f885ecc26484a535a0003bd2383 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 15:36:59 +0200 Subject: gnu: boost: Update to 1.68.0. * gnu/packages/boost.scm (boost): Update to 1.68.0. [arguments]: Remove /bin/sh substitution. --- gnu/packages/boost.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/boost.scm') diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 71b34ada1f..aa4a4d3dd8 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -43,7 +43,7 @@ (define-public boost (package (name "boost") - (version "1.67.0") + (version "1.68.0") (source (origin (method url-fetch) (uri (string-append @@ -52,7 +52,7 @@ ".tar.bz2")) (sha256 (base32 - "1fmdlmkzsrd46wwk834jsi2ypxj68w2by0rfcg2pzrafk5rck116")) + "1dyqsr9yb01y0nnjdq9b8q5s2kvhxbayk34832k5cpzn7jy30qbz")) (patches (search-patches "boost-fix-icu-build.patch")))) (build-system gnu-build-system) (inputs `(("icu4c" ,icu4c) @@ -78,7 +78,6 @@ (out (assoc-ref outputs "out"))) (substitute* '("libs/config/configure" "libs/spirit/classic/phoenix/test/runtest.sh" - "tools/build/doc/bjam.qbk" "tools/build/src/engine/execunix.c" "tools/build/src/engine/Jambase" "tools/build/src/engine/jambase.c") -- cgit 1.4.1 From da39ff58987d7ed082233ab9ac3ae8d6d0f50b5d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 17 Oct 2018 10:54:58 +0300 Subject: gnu: boost-for-mysql: Remove unnecessary phase. * gnu/packages/boost.scm (boost-for-mysql)[arguments]: Remove custom 'provide-libboost_python phase. Add removed '/bin/sh' substitution. --- gnu/packages/boost.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/packages/boost.scm') diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index d1b359b2cb..897987f71c 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2018 Maxim Cournoyer +;;; Copyright © 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,7 @@ (define-module (gnu packages boost) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -134,6 +136,15 @@ across a broad spectrum of applications.") (sha256 (base32 "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj")))) + (arguments (substitute-keyword-arguments (package-arguments boost) + ((#:phases phases) + `(modify-phases ,phases + ;; This was removed after boost-1.67. + (add-before 'configure 'more-bin-sh-patching + (lambda _ + (substitute* "tools/build/doc/bjam.qbk" + (("/bin/sh") (which "sh"))))) + (delete 'provide-libboost_python))))) (properties '((hidden? . #t))))) (define-public boost-sync -- cgit 1.4.1 From 07d4200c1c4e6c82c1369289e67311e1837bbd3d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 11:00:57 +0200 Subject: gnu: mdds: Update to 1.4.3. * gnu/packages/boost.scm (mdds): Update to 1.4.3. --- gnu/packages/boost.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/boost.scm') diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 897987f71c..b772781f56 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -182,14 +182,14 @@ Boost.Thread.") (define-public mdds (package (name "mdds") - (version "1.3.1") + (version "1.4.3") (source (origin (method url-fetch) (uri (string-append "http://kohei.us/files/mdds/src/mdds-" version ".tar.bz2")) (sha256 (base32 - "18g511z1lgfxrga2ld9yr95phmyfbd3ymbv4q5g5lyjn4ljcvf6w")))) + "10cw6irdm6d15nxnys2v5akp8yz52qijpcjvw0frwq7nz5d3vki5")))) (build-system gnu-build-system) (propagated-inputs `(("boost" ,boost))) ; inclusion of header files -- cgit 1.4.1