From patchwork Tue Feb 26 17:46:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 50519 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 002852C39; Tue, 26 Feb 2019 18:46:54 +0100 (CET) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id 912AC2BF5 for ; Tue, 26 Feb 2019 18:46:53 +0100 (CET) Received: by mail-wm1-f67.google.com with SMTP id g20so2379724wmh.5 for ; Tue, 26 Feb 2019 09:46:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=k0qUqoLMmCpk5mlfbV+EUaoPkaKMVYG/nwLu03x/nkk=; b=qJJfF6Z8FmhNGDj6xtZlNe1iUzWpY/eUV4XrDL/hgPricyTR1lUXDVxdkgEVSWag6v VwifSeS1TIYdAFtya83BnXw7PVg3YIHz9yPR/q3sDjHFBiXAkVC5X7qPnzvYA2FB5huk A+AEifGMOi6H0HpD+ggKwAz/XbarPMYk3RMSZCiYfbackymiyOUJWYGUt4j+OOGizHE+ RLp2l73XrJmsqT0Ft+P6Fcir5c5CZ5dNUxF8SBVeQYG8Mvxfapx6xYdEJ8wNOF7pWmjm WTXc9mzplXD0JQXUb3rwQG01tWYEj65Kufjpxk5BTToaBnzKYTmtdE/22OFJxl/F0+5F qwMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=k0qUqoLMmCpk5mlfbV+EUaoPkaKMVYG/nwLu03x/nkk=; b=euu9KdM2/r3mc3IKYGwmYz9gTlZuhZ1NCc8YL43sQWCD6EwB3wTHfVWs5hKnPDA9Jz 2Zf1dcQcegBEaadHAEQugQ/0ha3ZacLF8Y/yf3Uhaha135z77nt4Gu6A2c8WAaDyHkRQ Z9s+oyTKB0AxKan6BUkhvWhOJiERqLCWv+5O8XcXoXiok/zcTbt5pNe0HSBFG2DSru3Q HCJ/Ut5/EarHK0aZGtsleJ3Ye2TGrQSVyduiIkNe1VOFxigWpUZjIUXQ/go+Sg8GR6VV J3wTAVecz1U6waEclKeaHImLRS0p++023H9rpz10LUA8eCoZ63KsGPAWK3BFCf1bVt+I 2oiw== X-Gm-Message-State: AHQUAubaZSIkwB+jgLhjDDrLfwFREf+4jFWxOxYq/UXAXP/Wrfc2HNoD VqHmbQVmLO/Vgmvj5JG5MWfCieXl X-Google-Smtp-Source: AHgI3IY2uMikHYi0PR1OOhRKOFZPrWPRFRvMKtt2cWlOvUaBQnmfEpkBmmkpCTKmQKUTXa6sogvbAA== X-Received: by 2002:a1c:5fc5:: with SMTP id t188mr3358288wmb.86.1551203212745; Tue, 26 Feb 2019 09:46:52 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id a1sm18180134wrq.96.2019.02.26.09.46.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Feb 2019 09:46:51 -0800 (PST) From: luca.boccassi@gmail.com To: dev@dpdk.org Cc: bruce.richardson@intel.com, thomas@monjalon.net Date: Tue, 26 Feb 2019 17:46:32 +0000 Message-Id: <20190226174637.27452-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190103175725.5836-1-bluca@debian.org> References: <20190103175725.5836-1-bluca@debian.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v8 1/6] build: bump minimum Meson version to 0.47.1 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Luca Boccassi Meson 0.47.1 fixed a bug that is difficult to work around, which causes the linker flag of dependencies to be repeated dozens of times, which causes issues especially when using the built-in dependency() API. Bump the minimum version and remove obsolete version checks. Signed-off-by: Luca Boccassi Acked-by: Bruce Richardson --- v2: bump meson minimum version to 0.47.1 to avoid meson bug v3: split away first independent patch from series v4: add acked-by drivers/meson.build | 5 +---- kernel/linux/meson.build | 6 +----- meson.build | 35 +++++++++++++++-------------------- 3 files changed, 17 insertions(+), 29 deletions(-) diff --git a/drivers/meson.build b/drivers/meson.build index c3c66bbc0..e37d4fe2b 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -148,8 +148,5 @@ foreach class:driver_classes endif # build endforeach - if meson.version().version_compare('>=0.47') - # prior to 0.47, set_variable can't take array params - set_variable(class + '_drivers', class_drivers) - endif + set_variable(class + '_drivers', class_drivers) endforeach diff --git a/kernel/linux/meson.build b/kernel/linux/meson.build index 5b7ec06e1..d751d939f 100644 --- a/kernel/linux/meson.build +++ b/kernel/linux/meson.build @@ -27,11 +27,7 @@ else make_returncode = run_command('make', '-sC', kernel_dir, 'kernelversion').returncode() if make_returncode != 0 - if meson.version().version_compare('>=0.44') - warning(WARN_NO_HEADERS) - else - message('WARNING: ' + WARN_NO_HEADERS) - endif + warning(WARN_NO_HEADERS) else # returncode == 0 # DO ACTUAL MODULE BUILDING diff --git a/meson.build b/meson.build index 2bbd42bc8..69833de82 100644 --- a/meson.build +++ b/meson.build @@ -5,7 +5,7 @@ project('DPDK', 'C', version: '19.05.0-rc0', license: 'BSD', default_options: ['buildtype=release', 'default_library=static'], - meson_version: '>= 0.41' + meson_version: '>= 0.47.1' ) # set up some global vars for compiler, platform, configuration, etc. @@ -104,23 +104,18 @@ foreach lib:enabled_libs endforeach message(output_message + '\n') - -# prior to 0.47 set_variable didn't work with arrays, so we can't -# track driver lists easily -if meson.version().version_compare('>=0.47') - output_message = '\n===============\nDrivers Enabled\n===============\n' - foreach class:driver_classes - class_drivers = get_variable(class + '_drivers') - output_message += '\n' + class + ':\n\t' - output_count = 0 - foreach drv:class_drivers - output_message += drv + ', ' - output_count += 1 - if output_count == 8 - output_message += '\n\t' - output_count = 0 - endif - endforeach +output_message = '\n===============\nDrivers Enabled\n===============\n' +foreach class:driver_classes + class_drivers = get_variable(class + '_drivers') + output_message += '\n' + class + ':\n\t' + output_count = 0 + foreach drv:class_drivers + output_message += drv + ', ' + output_count += 1 + if output_count == 8 + output_message += '\n\t' + output_count = 0 + endif endforeach - message(output_message + '\n') -endif +endforeach +message(output_message + '\n')