From nobody Mon Feb 9 14:01:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675691631; cv=none; d=zohomail.com; s=zohoarc; b=UlUY3ZcIQIm7AULDopMujrltwSiJmLlZSCmr7ARs6zxq+HyDQZP2k/bW+PL0SAZoe1Mmui/aNhZHZ0kHk8njqdXsbuKXJC9ojrwg9s34gqAOo7bzvlvV9Hj1/OoKSjBhx7lkwiYl/xbKzg6sU7hj0BSGohMivPllUdh8CNFG1Ks= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675691631; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FcrtaeoAHrLIj183/J4jLprsqUpt8uee7TeiRTflA1g=; b=lgfZTpAq7nYb/2qLwGS3cJ4DwZdSOawMNJnVbKUyyE4Qt7MLVzd7Fxr4w3UaqYredkzVhF0oyQumA6qFMALrSf272rbb5MNyPnK4S1aEBuqDIEDada1FkZit2EmXzeQeqT0zh+I+IerjvGcp/y/Iiggu8YOoYXY//rdMZ1WcaK4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1675691631832907.5334954377078; Mon, 6 Feb 2023 05:53:51 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-613-xm-FQ3qKOPOB05RMHPzGGA-1; Mon, 06 Feb 2023 08:53:35 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C51FF85CCEF; Mon, 6 Feb 2023 13:53:29 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE692C15BAD; Mon, 6 Feb 2023 13:53:29 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 73BE919465B2; Mon, 6 Feb 2023 13:53:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0265F1946589 for ; Mon, 6 Feb 2023 13:53:26 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id DB8ED1410F36; Mon, 6 Feb 2023 13:53:25 +0000 (UTC) Received: from ridgehead.redhat.com (ovpn-193-197.brq.redhat.com [10.40.193.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5991D1415113; Mon, 6 Feb 2023 13:53:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675691630; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=FcrtaeoAHrLIj183/J4jLprsqUpt8uee7TeiRTflA1g=; b=a5zO+2Cmz5q1KJsv3Vku0x+CoQoDsdwubve5uUBIv7OAZIPIYhRKdLF9w/2lpsOaTJ9OmJ jaZ52VN+Egvm/OtF2HrdDfB2xZ8JKJCy0VYW/F5kPvBDKB/tnYsA39OT6iAGl6eWntylG8 gg3H3QuLX1Tu6Dh9kaVBF/nBCQ168EU= X-MC-Unique: xm-FQ3qKOPOB05RMHPzGGA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 09/20] ci: build.sh: Join MESON_ARGS and MESON_OPTS Date: Mon, 6 Feb 2023 14:53:06 +0100 Message-Id: <95163b72f229133c965cd21737634e3db6084c85.1675691295.git.eskultet@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675691633660100001 Content-Type: text/plain; charset="utf-8"; x-default="true" It is quite confusing seeing these two in a call like this one: $ meson build $MESON_OPTS $MESON_ARGS One has to ask 'how are they different' and 'shouldn't these be merged'. In fact, these variables hold very different things and we should make it more obvious. The problem is that renaming MESON_OPTS to something more meaningful, like 'MESON_CROSS_OPTS' which is what MESON_OPTS really does would require changes to lcitool and would impact Dockerfile generation which in turn might have an impact on other projects which rely on this lcitool functionality which is risky. Instead, provide a docstring for the former tu supplement the latter and join the two variables in a single one MESON_ARGS which is then passed to meson's command line so it's a little less confusing. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/build.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ci/build.sh b/ci/build.sh index 2a83f756d5..322aff2632 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -7,8 +7,15 @@ export VIR_TEST_DEBUG=3D1 # $MESON_OPTS is an env that can optionally be set in the container, # populated at build time from the Dockerfile. A typical use case would # be to pass options to trigger cross-compilation +# +# $MESON_ARGS correspond to meson's setup args, i.e. configure args. It's +# populated either from a GitLab's job configuration or from command line = as +# `$ helper build --meson-configure-args=3D-Dopt1 -Dopt2` when run in a lo= cal +# containerized environment =20 -meson setup build --werror -Dsystem=3Dtrue $MESON_OPTS $MESON_ARGS || \ +MESON_ARGS=3D"$MESON_ARGS $MESON_OPTS" + +meson setup build --werror -Dsystem=3Dtrue $MESON_ARGS || \ (cat build/meson-logs/meson-log.txt && exit 1) =20 meson compile -C build $MESON_BUILD_ARGS --=20 2.39.1