me/guix
Archived
1
0
Fork 0
Code Activity

gnu: cpp-httplib: Update to 0.12.5.

Browse source 
* gnu/packages/cpp.scm (cpp-httplib): Update to 0.12.5.
[arguments]: Adjust configure-flags to build the tests.  Add a make-flag
to set CXX.  Adjust custom 'disable-network-tests phase to skip more
network tests. Remove custom 'check phase.
[native-inputs]: Add googletest.
This commit is contained in:
Efraim Flashner 2023-06-05 21:59:44 +03:00
parent c1b8f1bc7a
commit ff6bb37299
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gnu/packages/cpp.scm
View file

@ -25,7 +25,7 @@
;;; Copyright © 2021 jgart <jgart@dismail.de> ;;; Copyright © 2021 jgart <jgart@dismail.de>
;;; Copyright © 2021 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2021 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2021 Disseminate Dissent <disseminatedissent@protonmail.com> ;;; Copyright © 2021 Disseminate Dissent <disseminatedissent@protonmail.com>
;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2022, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 muradm <mail@muradm.net> ;;; Copyright © 2022 muradm <mail@muradm.net>
;;; Copyright © 2022 Attila Lendvai <attila@lendvai.name> ;;; Copyright © 2022 Attila Lendvai <attila@lendvai.name>
;;; Copyright © 2022 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2022 Arun Isaac <arunisaac@systemreboot.net>
@ -821,7 +821,7 @@ tools:
;; header ;; header
(package (package
(name "cpp-httplib") (name "cpp-httplib")
(version "0.8.8") (version "0.12.5")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -829,16 +829,19 @@ tools:
(url "https://github.com/yhirose/cpp-httplib") (url "https://github.com/yhirose/cpp-httplib")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 "0c0gyfbvm34bgrqy9fhfxw1f8nb9zhf063j7xq91k892flb7qm1c")) (base32 "1m1p6h1dsxg4kg5zziffb6xl8zgjbkw7gmgmmlnrhpl3bswam87n"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
'("-DBUILD_SHARED_LIBS=ON" '("-DBUILD_SHARED_LIBS=ON"
"-DHTTPLIB_TEST=ON"
"-DHTTPLIB_COMPILE=ON" "-DHTTPLIB_COMPILE=ON"
"-DHTTPLIB_REQUIRE_BROTLI=ON" "-DHTTPLIB_REQUIRE_BROTLI=ON"
"-DHTTPLIB_REQUIRE_OPENSSL=ON" "-DHTTPLIB_REQUIRE_OPENSSL=ON"
"-DHTTPLIB_REQUIRE_ZLIB=ON") "-DHTTPLIB_REQUIRE_ZLIB=ON")
#:make-flags
'(,(string-append "CXX=" (cxx-for-target)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'disable-network-tests (add-after 'unpack 'disable-network-tests
@ -850,21 +853,19 @@ tools:
(string-append "(DISABLED_" test)))) (string-append "(DISABLED_" test))))
;; There are tests requiring network access, disable them ;; There are tests requiring network access, disable them
'("AbsoluteRedirectTest" "BaseAuthTest" "CancelTest" '("AbsoluteRedirectTest" "BaseAuthTest" "CancelTest"
"ConnectionErrorTest"
"ChunkedEncodingTest" "ChunkedEncodingTest" "ChunkedEncodingTest" "ChunkedEncodingTest"
"ClientDefaultHeadersTest"
"DecodeWithChunkedEncoding" "DefaultHeadersTest" "DecodeWithChunkedEncoding" "DefaultHeadersTest"
"DigestAuthTest" "HttpsToHttpRedirectTest" "DigestAuthTest" "HttpsToHttpRedirectTest"
"HostnameToIPConversionTest"
"RangeTest" "RedirectTest" "RelativeRedirectTest" "RangeTest" "RedirectTest" "RelativeRedirectTest"
"SSLClientTest" "SendAPI" "TooManyRedirectTest" "UrlWithSpace" "SSLClientTest" "SendAPI"
"YahooRedirectTest" "YahooRedirectTest")))) "SpecifyServerIPAddressTest"
(replace 'check "TooManyRedirectTest" "UrlWithSpace"
(lambda* (#:key source tests? #:allow-other-keys) "YahooRedirectTest" "YahooRedirectTest")))))))
;; openssl genrsa wants to write a file in the git checkout
(when tests?
(with-directory-excursion "../source/test"
(invoke "make"))))))))
(native-inputs (native-inputs
;; required to build shared lib (list googletest python))
(list python))
(inputs (inputs
(list brotli openssl zlib)) (list brotli openssl zlib))
(home-page "https://github.com/yhirose/cpp-httplib") (home-page "https://github.com/yhirose/cpp-httplib")