gnu: boost: Upgrade to 1.61.0.

* gnu/packages/boost.scm (boost): Upgrade to 1.61.0
* gnu/packages/databases.scm (mysql)[arguments]: Compute boost minor
version for substitution.
This commit is contained in:
Eric Bavier 2016-09-22 22:33:19 -05:00
parent cdf26f40b0
commit 6941965526
No known key found for this signature in database
GPG key ID: 1EBBD204781F962C
2 changed files with 6 additions and 4 deletions

View file

@ -34,7 +34,7 @@ (define-module (gnu packages boost)
(define-public boost (define-public boost
(package (package
(name "boost") (name "boost")
(version "1.60.0") (version "1.61.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -43,7 +43,7 @@ (define-public boost
".tar.bz2")) ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0fzx6dwqbrkd4bcd8pjv0fpapwmrxxwr8yx9g67lihlsk3zzysk8")))) "0h5nk7pgxf7xsvvshj9qfpsfp9wx6gq9r78n3nx736pxq83bsix5"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("zlib" ,zlib))) (inputs `(("zlib" ,zlib)))
(native-inputs (native-inputs

View file

@ -222,7 +222,7 @@ (define-public mysql
"0mlrxcvkn6bf869hjw9fb6m24ak26ndffnd91b4mknmz8cqkb1ch")))) "0mlrxcvkn6bf869hjw9fb6m24ak26ndffnd91b4mknmz8cqkb1ch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:configure-flags `(#:configure-flags
'("-DBUILD_CONFIG=mysql_release" '("-DBUILD_CONFIG=mysql_release"
"-DWITH_SSL=system" "-DWITH_SSL=system"
"-DWITH_ZLIB=system" "-DWITH_ZLIB=system"
@ -249,7 +249,9 @@ (define-public mysql
(lambda _ (lambda _
;; Mysql wants boost-1.59.0 specifically ;; Mysql wants boost-1.59.0 specifically
(substitute* "cmake/boost.cmake" (substitute* "cmake/boost.cmake"
(("59") "60")))) (("59")
,(match (string-split (package-version boost) #\.)
((_ minor . _) minor))))))
(add-after (add-after
'install 'remove-extra-binaries 'install 'remove-extra-binaries
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)