gnu: Remove special Boost C++14 variant.
This is no longer needed since commit a7ff66998f
.
* gnu/packages/boost.scm (boost-cxx11): Remove variable.
* gnu/packages/audio.scm (supercollider)[inputs]: Change BOOST-CXX11 to BOOST.
* gnu/packages/compression.scm (innoextract)[inputs]: Likewise.
* gnu/packages/mpd.scm (ncmpcpp)[inputs]: Likewise.
* gnu/packages/storage.scm (ceph)[inputs]: Likewise.
master
parent
e154547712
commit
4cb9b72633
|
@ -2274,7 +2274,7 @@ external_libraries/yaml-cpp/include)"))
|
||||||
("eudev" ,eudev) ;for user interactions with devices
|
("eudev" ,eudev) ;for user interactions with devices
|
||||||
("avahi" ,avahi) ;zeroconf service discovery support
|
("avahi" ,avahi) ;zeroconf service discovery support
|
||||||
("icu4c" ,icu4c)
|
("icu4c" ,icu4c)
|
||||||
("boost" ,boost-cxx14)
|
("boost" ,boost)
|
||||||
("boost-sync" ,boost-sync)
|
("boost-sync" ,boost-sync)
|
||||||
("yaml-cpp" ,yaml-cpp)))
|
("yaml-cpp" ,yaml-cpp)))
|
||||||
(home-page "https://github.com/supercollider/supercollider")
|
(home-page "https://github.com/supercollider/supercollider")
|
||||||
|
|
|
@ -123,16 +123,6 @@ across a broad spectrum of applications.")
|
||||||
(license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt"
|
(license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt"
|
||||||
"Some components have other similar licences."))))
|
"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
|
(define-public boost-for-mysql
|
||||||
;; Older version for MySQL 5.7.23.
|
;; Older version for MySQL 5.7.23.
|
||||||
(package
|
(package
|
||||||
|
|
|
@ -2263,7 +2263,7 @@ single-member files which can't be decompressed in parallel.")
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:tests? #f)) ;; No tests available.
|
`(#:tests? #f)) ;; No tests available.
|
||||||
(inputs `(("boost" ,boost-cxx14)
|
(inputs `(("boost" ,boost)
|
||||||
("libiconv" ,libiconv)
|
("libiconv" ,libiconv)
|
||||||
("xz" ,xz)))
|
("xz" ,xz)))
|
||||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||||
|
|
|
@ -244,7 +244,7 @@ terminal using ncurses.")
|
||||||
"0m0mjb049sl62vx13h9waavysa30mk0rphacksnvf94n13la62v5"))))
|
"0m0mjb049sl62vx13h9waavysa30mk0rphacksnvf94n13la62v5"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(inputs `(("libmpdclient" ,libmpdclient)
|
(inputs `(("libmpdclient" ,libmpdclient)
|
||||||
("boost" ,boost-cxx14)
|
("boost" ,boost)
|
||||||
("readline" ,readline)
|
("readline" ,readline)
|
||||||
("ncurses" ,ncurses)
|
("ncurses" ,ncurses)
|
||||||
("taglib" ,taglib)
|
("taglib" ,taglib)
|
||||||
|
|
|
@ -321,7 +321,7 @@
|
||||||
("python2-testtools" ,python2-testtools)
|
("python2-testtools" ,python2-testtools)
|
||||||
("python2-tox" ,python2-tox)))
|
("python2-tox" ,python2-tox)))
|
||||||
(inputs
|
(inputs
|
||||||
`(("boost" ,boost-cxx14)
|
`(("boost" ,boost)
|
||||||
("curl" ,curl)
|
("curl" ,curl)
|
||||||
("cryptsetup" ,cryptsetup)
|
("cryptsetup" ,cryptsetup)
|
||||||
("expat" ,expat)
|
("expat" ,expat)
|
||||||
|
|
Reference in New Issue