gnu: haproxy: Update to 2.7.5.

* gnu/packages/networking.scm (haproxy): Update to 2.7.4.
  [arguments]: Use Gexp.
  <make-flags>: Add extra build options 'USE_PCRE2_JIT' enables JIT for
  faster regex on libpcre2, 'USE_PROMEX' enables the Prometheus
  exporter. Set CC to use cc-for-target, point 'LUA_INC' and 'LUA_LIB'
  to corresponded '/include' and '/lib' outputs of Lua. Replace
  'USE_PCRE_2' by correct option 'USE_PCRE2'.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Sharlatan Hellseher 2023-03-17 22:03:56 +00:00 committed by Ludovic Courtès
parent f5c62f106d
commit fa715278bc
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5

View file

@ -4239,29 +4239,35 @@ (define-public vde2
(define-public haproxy (define-public haproxy
(package (package
(name "haproxy") (name "haproxy")
(version "2.1.7") (version "2.7.5")
(source (origin (source
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.haproxy.org/download/" (uri (string-append "https://www.haproxy.org/download/"
(version-major+minor version) (version-major+minor version)
"/src/haproxy-" version ".tar.gz")) "/src/haproxy-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "00j5lwvrf8lgfid3108gclxbd46v3mnd4lh0lw4l0nn3f0rf9ip2"))))
"0fd3c1znid5a9w3gcf77b85hm2a2558w9s02c4b7xzkmivqnqbir"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags (list
(let* ((out (assoc-ref %outputs "out"))) #:tests? #f ; there are only regression tests, using varnishtest
(list (string-append "PREFIX=" out) #:make-flags
(string-append "DOCDIR=" out "/share/" ,name) #~(list "LUA_LIB_NAME=lua"
"TARGET=linux-glibc" "TARGET=linux-glibc"
"USE_LUA=1" "USE_LUA=1"
"USE_OPENSSL=1" "USE_OPENSSL=1"
"USE_PCRE2=1"
"USE_PCRE2_JIT=1"
"USE_PROMEX=1"
"USE_ZLIB=1" "USE_ZLIB=1"
"USE_PCRE_2=1")) (string-append "CC=" #$(cc-for-target))
#:tests? #f ; there are only regression tests, using varnishtest (string-append "DOCDIR=" #$output "/share/" #$name)
(string-append "LUA_INC=" #$(this-package-input "lua") "/include")
(string-append "LUA_LIB=" #$(this-package-input "lua") "/lib")
(string-append "PREFIX=" #$output))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(delete 'configure)))) (delete 'configure))))
(inputs (inputs
(list lua openssl pcre2 zlib)) (list lua openssl pcre2 zlib))