On Thu, Apr 01, 2021 at 11:51:15AM +0200, Andrea Bolognani wrote:
On Thu, 2021-04-01 at 11:23 +0200, Erik Skultety wrote:
> Please squash this in before merging:
>
> diff --git a/build-aux/meson.build b/build-aux/meson.build
> index 1095982397..e491bdeebc 100644
> --- a/build-aux/meson.build
> +++ b/build-aux/meson.build
> @@ -26,10 +26,6 @@ if host_machine.system() == 'freebsd'
> if not grep_prog.found()
> error('GNU grep not found')
> endif
> - grep_cmd = run_command(grep_prog, '--version')
> - if grep_cmd.stdout().startswith('grep (BSD grep')
> - error('GNU grep not found')
> - endif
Mh, so what you're saying is that we can assume that
/usr/local/bin/grep is *always* going to be GNU grep? That's probably
a fair assumption.
I'd be surprised if a symlink existed in /usr/local/bin/grep pointing to the
distro's BSD grep, doesn't sound like FreeBSD hierarchy standards :).
I disagree that the hunk should be squashed in, though, since this
patch simply changes the error message and not what's been checked.
It should go in separately, either after this series or before it.
Do you want me to post it in that form, or would you rather do that
yourself since you have already done the work? Whatever is more
convenient for you :)
I honestly don't care, so if you squash it or append another patch to your
series before merging - up to you.
Erik