nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: varnish: Update to 6.2.0. 

* gnu/packages/web.scm (varnish): Update to 6.2.0.
[arguments]: Remove obsolete configure flag.  Add substitution for /bin/rm.
This commit is contained in:
Marius Bakke 2019-03-18 17:05:40 +01:00
parent c11f86ff16
commit 05109e8ef8
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/packages/web.scm
View File

@ -4810,13 +4810,13 @@ deployments.")
(package (package
(name "varnish") (name "varnish")
(home-page "https://varnish-cache.org/") (home-page "https://varnish-cache.org/")
(version "6.1.1") (version "6.2.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append home-page "_downloads/varnish-" version ".tgz")) (uri (string-append home-page "_downloads/varnish-" version ".tgz"))
(sha256 (sha256
(base32 (base32
"0gf9hzzrr1lndbbqi8cwlfasi7l517cy3nbgna88i78lm247rvp0")))) "0lwfk2gq99c653h5f51fs3j37r0gh2pf0p4w5z986nm2mi9z6yn3"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib") `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")
@ -4824,10 +4824,6 @@ deployments.")
(string-append "PTHREAD_CC=" (string-append "PTHREAD_CC="
(assoc-ref %build-inputs "gcc") (assoc-ref %build-inputs "gcc")
"/bin/gcc") "/bin/gcc")
;; XXX: Disable PCRE-JIT to work around a segmentation
;; fault when using jemalloc 5.x:
;; <https://github.com/varnishcache/varnish-cache/issues/2817>
"--disable-pcre-jit"
"--localstatedir=/var") "--localstatedir=/var")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -4839,6 +4835,8 @@ deployments.")
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh")))
(substitute* "bin/varnishd/mgt/mgt_shmem.c" (substitute* "bin/varnishd/mgt/mgt_shmem.c"
(("rm -rf") (string-append (which "rm") " -rf"))) (("rm -rf") (string-append (which "rm") " -rf")))
(substitute* "bin/varnishtest/vtc_main.c"
(("/bin/rm") (which "rm")))
#t)) #t))
(add-before 'install 'patch-Makefile (add-before 'install 'patch-Makefile
(lambda _ (lambda _