TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: varnish: Update to 7.0.0.

Browse source 
* gnu/packages/web.scm (varnish): Update to 7.0.0.
[arguments]: Set CC in #:configure-flags.  Rewrite use-absolute-file-names
phase to use named inputs instead of WHICH and patch one more file.  Remove
trailing #t's.
[inputs]: Add BASH-MINIMAL and COREUTILS.  Replace PCRE with PCRE2, and
PYTHON-WRAPPER with PYTHON.
This commit is contained in:
Marius Bakke 2021-09-16 14:39:56 +02:00
parent 7de73cabe8
commit bb6481af0e
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
gnu/packages/web.scm
View file

@ -19,7 +19,7 @@
;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 Bake Timmons <b3timmons@speedymail.org>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017, 2018, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018, 2020, 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 Petter <petter@mykolab.ch>
;;; Copyright © 2017, 2021 Pierre Langlois <pierre.langlois@gmx.com>
@ -5998,16 +5998,17 @@ (define-public varnish
(package
(name "varnish")
(home-page "https://varnish-cache.org/")
(version "6.5.1")
(version "7.0.0")
(source (origin
(method url-fetch)
(uri (string-append home-page "_downloads/varnish-" version ".tgz"))
(sha256
(base32
"1dfdswri6lkfk6kml3szvffm91y49pajgqy1k5y26llqixl4r5hi"))))
"11z0pa618lh925ih67wmp1gqk7i46l486j4spjy71g1n3w5mqylc"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")
(string-append "CC=" ,(cc-for-target))
;; Use absolute path of GCC so it's found at runtime.
(string-append "PTHREAD_CC="
(assoc-ref %build-inputs "gcc")
@ -6016,23 +6017,26 @@ (define-public varnish
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'use-absolute-file-names
(lambda _
(substitute* '("bin/varnishtest/vtc_varnish.c"
"bin/varnishtest/vtc_process.c"
"bin/varnishd/mgt/mgt_vcc.c"
"bin/varnishtest/tests/u00014.vtc")
(("/bin/sh") (which "sh")))
(substitute* "bin/varnishd/mgt/mgt_shmem.c"
(("rm -rf") (string-append (which "rm") " -rf")))
(substitute* "bin/varnishtest/vtc_main.c"
(("/bin/rm") (which "rm")))
#t))
(lambda* (#:key inputs #:allow-other-keys)
(let* ((bash (assoc-ref inputs "bash-minimal"))
(sh (string-append bash "/bin/sh"))
(coreutils (assoc-ref inputs "coreutils"))
(rm (string-append coreutils "/bin/rm")))
(substitute* '("bin/varnishtest/vtc_varnish.c"
"bin/varnishtest/vtc_process.c"
"bin/varnishtest/vtc_haproxy.c"
"bin/varnishtest/tests/u00014.vtc"
"bin/varnishd/mgt/mgt_vcc.c")
(("/bin/sh") sh))
(substitute* "bin/varnishd/mgt/mgt_shmem.c"
(("rm -rf") (string-append rm " -rf")))
(substitute* "bin/varnishtest/vtc_main.c"
(("/bin/rm") rm)))))
(add-before 'install 'patch-Makefile
(lambda _
(substitute* "Makefile"
;; Do not create /var/varnish during install.
(("^install-data-am: install-data-local") "install-data-am: "))
#t))
(("^install-data-am: install-data-local") "install-data-am: "))))
(add-after 'install 'wrap-varnishd
;; Varnish uses GCC to compile VCL, so wrap it with required GCC
;; environment variables to avoid propagating them to profiles.
@ -6045,17 +6049,18 @@ (define-public varnish
;; Add binutils to PATH so gcc finds the 'as' executable.
`("PATH" ":" prefix (,PATH))
;; Make sure 'crti.o' et.al is found.
`("LIBRARY_PATH" ":" prefix (,LIBRARY_PATH)))
#t))))))
`("LIBRARY_PATH" ":" prefix (,LIBRARY_PATH)))))))))
(native-inputs
`(("pkg-config" ,pkg-config)
("python-sphinx" ,python-sphinx)
("rst2man" ,python-docutils)))
(inputs
`(("jemalloc" ,jemalloc)
`(("bash-minimal" ,bash-minimal)
("coreutils" ,coreutils)
("jemalloc" ,jemalloc)
("ncurses" ,ncurses)
("pcre" ,pcre)
("python" ,python-wrapper)
("pcre2" ,pcre2)
("python" ,python)
("readline" ,readline)))
(synopsis "Web application accelerator")
(description