me
/
guix
Archived
1
0
Fork 0
Code

gnu: fmt: Build shared library instead of static. 

* gnu/packages/pretty-print.scm (fmt)[arguments]: New field.
* gnu/packages/networking.scm (fmt-restinio): Remove variable.
(restinio)[propagated-inputs]: Change from FMT-RESTINIO to FMT.
(opendht)[inputs]: Likewise.
master
Marius Bakke 2019-12-11 21:18:43 +01:00
parent 2ecb5e7901
commit 71ce0b5290
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/packages/networking.scm
View File

@ -2523,12 +2523,6 @@ communication over HTTP.")
(home-page "https://github.com/Corvusoft/restbed") (home-page "https://github.com/Corvusoft/restbed")
(license license:agpl3+)))) (license license:agpl3+))))
(define fmt-restinio
(package
(inherit fmt)
(arguments
'(#:configure-flags '("-DCMAKE_CXX_FLAGS=-fPIC")))))
(define-public restinio (define-public restinio
(package (package
(name "restinio") (name "restinio")
@ -2553,7 +2547,7 @@ communication over HTTP.")
("sobjectizer" ,sobjectizer))) ("sobjectizer" ,sobjectizer)))
(propagated-inputs (propagated-inputs
`(("asio", asio) `(("asio", asio)
("fmt" ,fmt-restinio) ("fmt" ,fmt)
("http-parser", http-parser))) ("http-parser", http-parser)))
(arguments (arguments
`(#:configure-flags '("-DRESTINIO_INSTALL=on") `(#:configure-flags '("-DRESTINIO_INSTALL=on")
@ -2592,7 +2586,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.")
("readline" ,readline) ("readline" ,readline)
("jsoncpp" ,jsoncpp) ("jsoncpp" ,jsoncpp)
("openssl" ,openssl) ("openssl" ,openssl)
("fmt" ,fmt-restinio))) ("fmt" ,fmt)))
(propagated-inputs (propagated-inputs
`(("argon2" ,argon2) ; TODO: Needed for the pkg-config .pc file to work? `(("argon2" ,argon2) ; TODO: Needed for the pkg-config .pc file to work?
("msgpack" ,msgpack))) ;included in several installed headers ("msgpack" ,msgpack))) ;included in several installed headers

9
gnu/packages/pretty-print.scm
View File

@ -174,6 +174,8 @@ different programming languages.")
(base32 (base32
"0h148anbaqgch6n69pxsvs1c9wmykgd052wmzgdia7qpz8w6p8dl")))) "0h148anbaqgch6n69pxsvs1c9wmykgd052wmzgdia7qpz8w6p8dl"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments
'(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
(native-inputs (native-inputs
`(("unzip" ,unzip))) `(("unzip" ,unzip)))
(home-page "http://fmtlib.net/") (home-page "http://fmtlib.net/")
@ -185,6 +187,13 @@ to @code{IOStreams}.")
;; The library is bsd-2, but documentation and tests include other licenses. ;; The library is bsd-2, but documentation and tests include other licenses.
(license (list bsd-2 bsd-3 psfl)))) (license (list bsd-2 bsd-3 psfl))))
(define-public fmt-restinio
(hidden-package
(package/inherit
fmt
(arguments
'(#:configure-flags '("-DCMAKE_CXX_FLAGS=-fPIC"))))))
(define-public source-highlight (define-public source-highlight
(package (package
(name "source-highlight") (name "source-highlight")