From patchwork Tue Jan 22 13:10:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 49995 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 DD2FE3237; Tue, 22 Jan 2019 14:12:06 +0100 (CET) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id BFAD2316B for ; Tue, 22 Jan 2019 14:12:05 +0100 (CET) Received: by mail-wm1-f66.google.com with SMTP id t200so14248293wmt.0 for ; Tue, 22 Jan 2019 05:12:05 -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=F0ObmkAnvZ7TbEv6QNWj1SX/zwGNPV/6LlFQwZwlH7I=; b=lLSgGipMsuwtR/8fh7G9URQxzesU6EViP5+rj6ov2cI7fyZ+sTcw5HwRmzbJi1ECcn euZIGjy88YTDP9kkusROGwPTXNFk6dmEPJMaJ0tog3Rc7thmr58Dm4oRyttrTbncfrVd uJnguu8r6fm5fxPxg+CNEYytxPQXyHT0oa94hOlzQPmFfyZ/Ztf0Aip5CdeDMxTMWIFm CoO9t+lWgJEevG/DE2zVqqCSfIyi5M4nL3iqOIYHeRiNhgWdm5I6Po3virORrLw2rUgv JmQcTyGt9Cj2rG86DmDOlJlBRx8x3U+YAmNcgCpJ/lO6aP+TgLFJCWgnRkMmLp2nhBCU Lw9w== X-Gm-Message-State: AJcUukeu9W9Tzeww0C/JGJcqoj95zvJvNwokKBvnsAOrcb1sw+KqyMEL TdL5gzhF1Gd3A7UqeNeDERexHLI7 X-Google-Smtp-Source: ALg8bN7T4uff/6LmdpsP22l1rosA6BUuiQpzepOu/274kWcqCV8Q+VllkVDNSFh2cyi3Xxmame9wuw== X-Received: by 2002:a1c:544f:: with SMTP id p15mr3701177wmi.37.1548162725011; Tue, 22 Jan 2019 05:12:05 -0800 (PST) Received: from localhost ([2001:1be0:110d:fcfe:132c:a71a:1896:1395]) by smtp.gmail.com with ESMTPSA id y12sm33143657wmi.7.2019.01.22.05.12.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Jan 2019 05:12:03 -0800 (PST) From: Luca Boccassi To: dev@dpdk.org Cc: Luca Boccassi Date: Tue, 22 Jan 2019 13:10:51 +0000 Message-Id: <20190122131054.25196-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 v5 1/4] 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 68429f850..bef38ac37 100644 --- a/meson.build +++ b/meson.build @@ -5,7 +5,7 @@ project('DPDK', 'C', version: '19.02.0-rc3', 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')