[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#32771] [PATCH 1/2] gnu: varnish: Use absolute file name of "rm".
From: |
Christopher Baines |
Subject: |
[bug#32771] [PATCH 1/2] gnu: varnish: Use absolute file name of "rm". |
Date: |
Sat, 22 Sep 2018 18:06:20 +0100 |
User-agent: |
mu4e 1.0; emacs 26.1 |
Marius Bakke <address@hidden> writes:
> * gnu/packages/web.scm (varnish)[arguments]: Rename 'patch-bin-sh-phase to
> 'use-absolute-file-names and add substitution.
> ---
> gnu/packages/web.scm | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
> index b6bee57f9..26c2e9128 100644
> --- a/gnu/packages/web.scm
> +++ b/gnu/packages/web.scm
> @@ -5019,12 +5019,14 @@ deployments.")
> "--localstatedir=/var")
> #:phases
> (modify-phases %standard-phases
> - (add-after 'unpack 'patch-/bin/sh
> + (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/sh") (which "sh")))
> + (substitute* "bin/varnishd/mgt/mgt_shmem.c"
> + (("rm -rf") (string-append (which "rm") " -rf")))
> #t))
> (add-before 'install 'patch-Makefile
> (lambda _
This applies and varnish builds, so this looks good to me :)
signature.asc
Description: PGP signature