diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-11-04 15:03:24 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-11-06 00:08:05 -0400 |
| commit | 4f407a9c49c1948e916e41b0597254ff6069e7f1 (patch) | |
| tree | 73a6d71ff8b1a93a3ed52848ea459e6bd44a682c | |
| parent | bc27d83b96bfa45727eaa168079fc9217e9cba8a (diff) | |
| download | guix-4f407a9c49c1948e916e41b0597254ff6069e7f1.tar guix-4f407a9c49c1948e916e41b0597254ff6069e7f1.tar.gz | |
gnu: restinio: Prepare for tests and propagate some inputs.
* gnu/packages/networking.scm (restinio): Update to 0.6.15.
[configure-flags]: New field.
[phases]: {change-directory}: Change directory to 'dev'.
[inputs]: Remove zlib, catch2, boost, pcre, and pcre2.
[propagated-inputs]: Add pcre, pcre2, and zlib.
[native-inputs]: Add catch2, clara, and json-dto.
| -rw-r--r-- | gnu/packages/networking.scm | 44 |
1 files changed, 28 insertions, 16 deletions
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index b0393a7e69..99fd1445f2 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3640,24 +3640,36 @@ communication over HTTP.") (base32 "1f8d5nfm8jqhspzsslwb1b7j4glipz31i9vszrcnkx3clc39nj2n")))) (build-system cmake-build-system) - (inputs ; TODO: Need to force-keep references on some inputs, e.g. boost. - (list zlib - catch2 - openssl - boost - pcre - pcre2 + (arguments + (list + ;; Multiple tests fail to run in the build container due to host name + ;; resolution (see: https://github.com/Stiffstream/restinio/issues/172). + #:tests? #f + #:configure-flags #~(list "-DRESTINIO_FIND_DEPS=ON" + "-DRESTINIO_INSTALL=ON" + "-DRESTINIO_TEST=ON" + "-DRESTINIO_USE_EXTERNAL_HTTP_PARSER=ON" + "-DRESTINIO_USE_EXTERNAL_SOBJECTIZER=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'change-directory + (lambda _ + (chdir "dev")))))) + (native-inputs + (list catch2 + clara + json-dto)) + (inputs + (list openssl sobjectizer)) (propagated-inputs - (list asio fmt-8 http-parser)) - (arguments - `(#:configure-flags '("-DRESTINIO_INSTALL=on") - #:tests? #f ; TODO: The tests are called from the root CMakelist, need RESTINIO_TEST=on. - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'change-directory - (lambda _ - (chdir "dev/restinio")))))) + ;; These are all #include'd by restinio's .hpp header files. + (list asio + fmt-8 + http-parser + pcre + pcre2 + zlib)) (home-page "https://stiffstream.com/en/products/restinio.html") (synopsis "C++14 library that gives you an embedded HTTP/Websocket server") (description "RESTinio is a header-only C++14 library that gives you an embedded |