From patchwork Tue Jan 10 17:39:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 640869 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2853048pvb; Tue, 10 Jan 2023 10:23:37 -0800 (PST) X-Google-Smtp-Source: AMrXdXuGwMToUmgmZFN5V8bMCHejUL6EzEPDGX8d1ZKvWJGSc1XDQ6B4ZhkArPjc51pS27WDKIL3 X-Received: by 2002:a05:6214:5983:b0:4c7:64ab:1b98 with SMTP id ll3-20020a056214598300b004c764ab1b98mr116090077qvb.42.1673375017128; Tue, 10 Jan 2023 10:23:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673375017; cv=none; d=google.com; s=arc-20160816; b=EMgDdyfBdCa+BUYXH1szFuSFeubnLONAeS8rgHgai98uXs8BueEqJu9OxyN2KrwxIA fziqx2zWTa07GmV50p16g2PKnsaF/IaKfE9ItgCOeLpszDG2RsptY22N6zyerZcV1U+w SL+yZ+UE8erYAw/yJahszd2J2ACV6AJRfJHVyWFVBuaEWWizJKZ0+J7Pdz7HGVrLI77D zesHd90wff64Fj1TjN/D3BgpDq/a95THQ+mBGaPpHScza/rcR5O2gwdzCPrIvtyGN0V9 t/ZtB84eHYdmnmXndcYHDmvAIKIoWxk/ZN7VBhlFyvi0zXlpJNLe1DqTO8rhwUWJQ7Ch KxhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/rFoN1+6hqCTYGYDksjk1ynmsYhV/AhUVVwODaCS298=; b=Or8yooSE9WQegSJTYh4m3QiNRNyyfLSCe1oUdNgJlBlU+NaG8ebe+j6QcYwg3wLGhV 4+NWQMdf0TquCK2aJh6knqYFpL+o+sFtXhEjnXqo9Z890Kj9N8AZ6+7KNE5iAfF7raTv YXVZ0SCsHgHUezHDBAZVQep7YtCiNCpLFbZr42LzF/lph9CMUrOU6RAE9O5NaYIAMbgG Q6Isw13x92ZBiM824dhvsgYQvGatpP91eq49ueObBy5fslhiAXqjZhSyxYqL8y4GKAga Q3YF0DDt9lKcWP5s1n6dCnunrEvTIKTsCcdQKgwzYxDan51ya2ZQe3fzYXypRMqG8Wn0 naTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bkmPqtSy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTP id hf8-20020a0562140e8800b004bb83a1b2d4si6559946qvb.263.2023.01.10.10.23.37 for ; Tue, 10 Jan 2023 10:23:37 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bkmPqtSy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFIb4-0003TZ-Hu; Tue, 10 Jan 2023 12:39:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFIb2-0003R9-OD for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:36 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFIaz-0001FK-53 for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:36 -0500 Received: by mail-wm1-x336.google.com with SMTP id k26-20020a05600c1c9a00b003d972646a7dso12505875wms.5 for ; Tue, 10 Jan 2023 09:39:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/rFoN1+6hqCTYGYDksjk1ynmsYhV/AhUVVwODaCS298=; b=bkmPqtSyWkx4x+JxMiE38XylY27VjsZcvOsQ7DHuqx6ioKV20yPY6EHdStr5iEqVvd HeMhUZtP9kkgDJ2j1dKW6TnT+RFjVFbNfbRWuCSOwzJn/fIrfIkbWJJuKwDfyGPKmXUp Hg2WL3hDuNJfpcv3nQOZxDYp5PJzhP9E7D0U/Ri/oPWJR4Zt8jsrSeyUFAWviXI2NJsK +y3vy+gv43bmcMjEcUNBTOUHXLg25Y2cir5ifuutB2SDp3aLXcIZRY+Jyb8mHVBPNUlJ jSzyZ8xnhDW7B+8/7FNNPo6gmz2GXhUnx2meXjw/ys75h8hQhJpAAapOkZ4OR8fz6rvs oDTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/rFoN1+6hqCTYGYDksjk1ynmsYhV/AhUVVwODaCS298=; b=PGRRJz91FfCF/0FBDkUaVLK9VpvTuKoXGsEUtAv7UhXrZHjB0D7lt3opAzhDyTbtN4 ZdkJ5e3eu40+VBmINwcwdKz7ifEShSK7Wu5Mwvppt5KQqSCjyaVa87/9Jv/JHQrMz8XH 6LBFEL6W/cR2KUdr4VBFSsztjFg5sBRygqxFWhH89hJQz39DJYn3AE2tSI6Wvfg6O0AO Zahc62d+AZTWrGlea6mEHh1Vg12dIWq1556R7x6+SU8RMZuOLDmCncu+ZM+uoo+1/Q/Y mZt1rgNjjlPpXi7QJziWIhaeLGEOoHSUDClmoDGTBksYh6+y2/QDXrsEKTDbAVGSEg7Z V+lg== X-Gm-Message-State: AFqh2koObsMql1UCkkzU2QyoNVRgr0QhBqfILWhz0fe/ehSmcvdZDAk6 ISlqRMO98fdN45CPmB6OFtfvgQ== X-Received: by 2002:a05:600c:3596:b0:3d2:3b8d:21e5 with SMTP id p22-20020a05600c359600b003d23b8d21e5mr49094455wmq.14.1673372371421; Tue, 10 Jan 2023 09:39:31 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id l36-20020a05600c1d2400b003d9fb59c16fsm2455956wms.11.2023.01.10.09.39.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:29 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 803761FFBF; Tue, 10 Jan 2023 17:39:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson Subject: [PATCH 07/26] configure: replace Perl usage with sed Date: Tue, 10 Jan 2023 17:39:03 +0000 Message-Id: <20230110173922.265055-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Marc-André Lureau 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 Tested-by: Thomas Huth Message-Id: <20230110132700.833690-4-marcandre.lureau@redhat.com> Signed-off-by: Alex Bennée --- 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