From patchwork Wed Feb 6 17:08:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 50149 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 E93461B3AF; Wed, 6 Feb 2019 18:08:58 +0100 (CET) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id E5B4C1B3AE for ; Wed, 6 Feb 2019 18:08:57 +0100 (CET) Received: by mail-wr1-f65.google.com with SMTP id p4so8425883wrt.7 for ; Wed, 06 Feb 2019 09:08:57 -0800 (PST) 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=jbOPMZL9GH9UROtm++9rpn0BNrVshHNy0zIfPYwu5WI=; b=PxiThAp26SOYb2tdIebrgcjI1Vr/lqjnpZtfXR+g3ZXBbz/3OynPo64hd2jV8HnDut 8tsi2pO7gVFCGD7EGWGYkv2dTRdjU7l+7k5nZ9l/EZdl0K+g9jrWKixW3CkA6l6aF2pf XDyZiT2Dmzind70kNrVdL2cMHSJ6D69hXQj1fbjPMgiB00LPyxgm9qme2H6KA+o8NLkY gLuvhPbIiOhE4rmOFmzLgggtDhJNRe3nsvfuuHaLVGmwohg3eqCNCKzFJgQEl+n0z3iB 0M/6y6ZA/AHSKpgJTpZEHAWMZQvG1vOMXNL1mVgwiZ6qNq2pveKVM2iEp+gJDNyxo7zW sTRQ== X-Gm-Message-State: AHQUAub8d7vWNLD6bmUlvCB34TSWa2jdIMimN8RSxoFLmtvzI0rNcZfm 0hJNSfoEQp68fi8Kf7uwmv9nhEfu X-Google-Smtp-Source: AHgI3IamUgUubs9TO4aQQJeSgOnXceUJ3MrGptLpOI9TbRLOGSgJTKWrSWPaLXDUWNjq/fK8kX1W3w== X-Received: by 2002:adf:a28d:: with SMTP id s13mr9238722wra.100.1549472937009; Wed, 06 Feb 2019 09:08:57 -0800 (PST) Received: from localhost ([2a01:4b00:f419:6f00:b833:9472:a517:a18f]) by smtp.gmail.com with ESMTPSA id 126sm15398315wmd.1.2019.02.06.09.08.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 06 Feb 2019 09:08:55 -0800 (PST) From: Luca Boccassi To: dev@dpdk.org Cc: bruce.richardson@intel.com, Luca Boccassi Date: Wed, 6 Feb 2019 17:08:44 +0000 Message-Id: <20190206170848.19059-1-bluca@debian.org> 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 v6 1/5] 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" 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 7f5e8674b..e9793b127 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. @@ -105,23 +105,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')