From patchwork Tue Nov 17 19:06:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 1401755 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=weilnetz.de Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CbFnx37Ryz9s1l for ; Wed, 18 Nov 2020 06:08:05 +1100 (AEDT) Received: from localhost ([::1]:58896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kf6Kh-0005UG-CR for incoming@patchwork.ozlabs.org; Tue, 17 Nov 2020 14:08:03 -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) X-Virus-Scanned: Debian amavisd-new at v2201612906741603.powersrv.de 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) From: Stefan Weil To: qemu-devel@nongnu.org, Paolo Bonzini , =?utf-8?q?Ma?= =?utf-8?q?rc-Andr=C3=A9_Lureau?= , =?utf-8?q?D?= =?utf-8?q?aniel_P_=2E_Berrang=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 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" `make installer` with a DLL directory was broken. Signed-off-by: Stefan Weil Reviewed-by: Marc-André 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 = "w64" makensis += ["-DW64"] if os.path.exists(os.path.join(args.srcdir, "dll")): - makensis += "-DDLLDIR={0}/dll/{1}".format(args.srcdir, dlldir) + makensis += ["-DDLLDIR={0}/dll/{1}".format(args.srcdir, dlldir)] makensis += ["-DOUTFILE=" + args.outfile] + args.nsisargs subprocess.run(makensis)