diff options
| author | Leo Famulari <leo@famulari.name> | 2018-12-05 01:28:00 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2018-12-07 19:42:59 -0500 |
| commit | b9103c827c605dee32baf62816a0429543b3e451 (patch) | |
| tree | 4ddf47b57942a049c6cde51a2c81e4e4be999618 | |
| parent | 23a1f738b1ef83c3dcb329e1c68617b0452e6a07 (diff) | |
| download | guix-b9103c827c605dee32baf62816a0429543b3e451.tar.gz | |
gnu: Add a C++14 variant of Boost for packages that need it.
Fixes <https://bugs.gnu.org/33605> and <https://bugs.gnu.org/33610>. * gnu/packages/boost.scm (boost-cxx14): New variable. * gnu/packages/compression.scm (innoextract)[inputs]: Use it. * gnu/packages/mpd.scm (ncmpcpp)[inputs]: Use it.
| -rw-r--r-- | gnu/packages/boost.scm | 10 | ||||
| -rw-r--r-- | gnu/packages/compression.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/mpd.scm | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index b772781f56..f9108b3ad6 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -122,6 +122,16 @@ 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 diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 32b92a976c..e8a50c676c 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -2263,7 +2263,7 @@ single-member files which can't be decompressed in parallel.") (build-system cmake-build-system) (arguments `(#:tests? #f)) ;; No tests available. - (inputs `(("boost" ,boost) + (inputs `(("boost" ,boost-cxx14) ("libiconv" ,libiconv) ("xz" ,xz))) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index fe8610ab94..0a81a3b8b8 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -244,7 +244,7 @@ terminal using ncurses.") "0m0mjb049sl62vx13h9waavysa30mk0rphacksnvf94n13la62v5")))) (build-system gnu-build-system) (inputs `(("libmpdclient" ,libmpdclient) - ("boost" ,boost) + ("boost" ,boost-cxx14) ("readline" ,readline) ("ncurses" ,ncurses) ("taglib" ,taglib) |