On 10/01/2023 09.02, marcandre.lur...@redhat.com wrote:
From: Marc-André Lureau <marcandre.lur...@redhat.com>Let's try to reduce our Perl usage during config/build-time. Note: this patch might be dropped if "configure: remove backwards-compatibility code" is merged earlier. Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> --- configure | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 2281892657..9a944698b4 100755 --- a/configure +++ b/configure @@ -2571,11 +2571,9 @@ else if test -f meson-private/cmd_line.txt; then # Adjust old command line options whose type was changed # Avoids having to use "setup --wipe" when Meson is upgraded - perl -i -ne ' - s/^gettext = true$/gettext = auto/; - s/^gettext = false$/gettext = disabled/; - /^b_staticpic/ && next; - print;' meson-private/cmd_line.txt + sed -i.bak -e 's/^gettext = true$/gettext = auto/g' \ + -e 's/^gettext = false$/gettext = disabled/g' \ + -e '/^b_staticpic/d' meson-private/cmd_line.txt fi fi
I've ran "make vm-build-freebsd" and "make vm-build-openbsd" with this patch and it worked fine, I didn't spot anything in the console output, thus:
Tested-by: Thomas Huth <th...@redhat.com>
