From nobody Sat May 4 14:11:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1605640108; cv=none; d=zohomail.com; s=zohoarc; b=jboGEOB51ttpW2oHES6p6TGyDFcis1kTHrk2yMDd9CwqrTShgmohPnVEuf5fRqj0bWcE+q7gsMNa8rhK9c0OwoKg2JxH5n30gwHjM5g6GkqDRfh5Hjm9Av8j/DpoCZzdOlRHEIPH/zIHqQRPnFr49BGLk78SlHBhtJbF3E4E2Fs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605640108; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=6nC6cS8uzEM2fXFVwfIN/a3i9DYgPHMF7U3VoQ1ivmQ=; b=D9xETUI6YdvjaaNJc+jLLSKkH+eZDzk0yuYg7ZLS6SvGUYan6D/zfURji7FyYna47GMCa+y8sZ2u00pzsYLkLm+4h7aVzu1VSR0k2b+oJaGRA7WLztZTNMwUZ8ayX4slDHMqvTQHmhaOvrBmnPscQhTs4kAM4Y7DRQWOUXFWA6o= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605640108467546.2225469915604; Tue, 17 Nov 2020 11:08:28 -0800 (PST) Received: from localhost ([::1]:60840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kf6L4-0006He-7l for importer@patchew.org; Tue, 17 Nov 2020 14:08:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60262) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kf6KG-0005Sj-Sd for qemu-devel@nongnu.org; Tue, 17 Nov 2020 14:07:36 -0500 Received: from mail.weilnetz.de ([37.120.169.71]:50206 helo=v2201612906741603.powersrv.de) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kf6KD-0005Ux-P2 for qemu-devel@nongnu.org; Tue, 17 Nov 2020 14:07:36 -0500 Received: from localhost (localhost [127.0.0.1]) by v2201612906741603.powersrv.de (Postfix) with ESMTP id 04EB7DB2587; Tue, 17 Nov 2020 20:07:29 +0100 (CET) Received: from v2201612906741603.powersrv.de ([127.0.0.1]) by localhost (v2201612906741603.powersrv.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id M1CFy4Wk9CY7; Tue, 17 Nov 2020 20:06:43 +0100 (CET) Received: from qemu.weilnetz.de (qemu.weilnetz.de [188.68.58.204]) by v2201612906741603.powersrv.de (Postfix) with ESMTP id 738C2DB2579; Tue, 17 Nov 2020 20:06:43 +0100 (CET) Received: by qemu.weilnetz.de (Postfix, from userid 1000) id 1F9C8460019; Tue, 17 Nov 2020 20:06:43 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at v2201612906741603.powersrv.de From: Stefan Weil To: qemu-devel@nongnu.org, Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PATCH for-5.2] meson: Fix argument for makensis (build regression) Date: Tue, 17 Nov 2020 20:06:40 +0100 Message-Id: <20201117190640.390359-1-sw@weilnetz.de> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=37.120.169.71; envelope-from=stefan@weilnetz.de; helo=v2201612906741603.powersrv.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/17 14:07:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Weil Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" `make installer` with a DLL directory was broken. Signed-off-by: Stefan Weil Reviewed-by: Marc-Andr=C3=A9 Lureau --- scripts/nsis.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/nsis.py b/scripts/nsis.py index e1c409344e..5135a05831 100644 --- a/scripts/nsis.py +++ b/scripts/nsis.py @@ -65,7 +65,7 @@ def main(): dlldir =3D "w64" makensis +=3D ["-DW64"] if os.path.exists(os.path.join(args.srcdir, "dll")): - makensis +=3D "-DDLLDIR=3D{0}/dll/{1}".format(args.srcdir, dll= dir) + makensis +=3D ["-DDLLDIR=3D{0}/dll/{1}".format(args.srcdir, dl= ldir)] =20 makensis +=3D ["-DOUTFILE=3D" + args.outfile] + args.nsisargs subprocess.run(makensis) --=20 2.29.2