From patchwork Fri Sep 20 12:57:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 144354 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 194F64599D; Fri, 20 Sep 2024 14:57:55 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6079B43405; Fri, 20 Sep 2024 14:57:52 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by mails.dpdk.org (Postfix) with ESMTP id 1C36D433C6 for ; Fri, 20 Sep 2024 14:57:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1726837072; x=1758373072; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+bup/g7QoNrPL9agLTItMqFiRktKf7F0uszOsDWvw04=; b=d/JLfP6Yi8I+fUEJx7YDeXBfzFOje4OdVkYG0qvHS1PMIoSy0Ncj0if3 lj9TfFz2IWdPXB+CwZ6I++tN+0juUHaTm4vkr3puhsuy1lkuvZIYH1Dl/ DTO09ExaroRXOqYe2yrxZd62/giKegr+dd1JfPlf+DPbQ52Eh7oR25ysD 4jsjtN8uVcVlaPnEEqF/6yWZNsdrVwwvHriEpfPlufP6TntWpBijfsDWL Dz5NLMer0W5BHIQetYHCgFx/LeWAeIvs7qCAEs2whlrCAAOsTV+us3HAh 0tQFS1yI6mIy4TUjjVeIpsn4vsKNEOq+rVStIdCuaZDcWcaeULp4fH9NL w==; X-CSE-ConnectionGUID: 9XsMCdYXQX+kxT+jAFKg9A== X-CSE-MsgGUID: fdDKKCT4Smm1uhznSy921A== X-IronPort-AV: E=McAfee;i="6700,10204,11200"; a="25991092" X-IronPort-AV: E=Sophos;i="6.10,244,1719903600"; d="scan'208";a="25991092" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Sep 2024 05:57:51 -0700 X-CSE-ConnectionGUID: ttCZgXzsTY6pDV7RcTF9gw== X-CSE-MsgGUID: BOFcj+N/SQec1RlL3f95yg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,244,1719903600"; d="scan'208";a="71135891" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa008.jf.intel.com with ESMTP; 20 Sep 2024 05:57:50 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: mb@smartsharesystems.com, thomas@monjalon.net, david.marchand@redhat.com, Bruce Richardson Subject: [PATCH 1/5] build: increase minimum meson version to 0.57 Date: Fri, 20 Sep 2024 13:57:33 +0100 Message-ID: <20240920125737.1197969-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240920125737.1197969-1-bruce.richardson@intel.com> References: <20240920125737.1197969-1-bruce.richardson@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org In order to work around some deprecated functions in meson, we need to increase meson version. Increasing to 0.57 to also gain support for other useful features for us in DPDK. Changes of interest to DPDK include: * Use get_external_property instead of get_cross_property * Ability to use a VERSION file rather than hacking it with scripting * Ability to set built-in options in cross-build files * Ability to set pkg_config_libdir in cross-build files Signed-off-by: Bruce Richardson Reviewed-by: Robin Jarry --- .ci/linux-setup.sh | 2 +- doc/guides/linux_gsg/sys_reqs.rst | 2 +- doc/guides/prog_guide/build-sdk-meson.rst | 2 +- meson.build | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/linux-setup.sh b/.ci/linux-setup.sh index 975bf32144..8512a92b21 100755 --- a/.ci/linux-setup.sh +++ b/.ci/linux-setup.sh @@ -4,7 +4,7 @@ [ "$(id -u)" != '0' ] || alias sudo= # need to install as 'root' since some of the unit tests won't run without it -sudo python3 -m pip install --upgrade 'meson==0.53.2' +sudo python3 -m pip install --upgrade 'meson==0.57.0' # setup hugepages. error ignored because having hugepage is not mandatory. cat /proc/meminfo diff --git a/doc/guides/linux_gsg/sys_reqs.rst b/doc/guides/linux_gsg/sys_reqs.rst index 9c5282573e..13d632cec7 100644 --- a/doc/guides/linux_gsg/sys_reqs.rst +++ b/doc/guides/linux_gsg/sys_reqs.rst @@ -44,7 +44,7 @@ Compilation of the DPDK * Python 3.6 or later. -* Meson (version 0.53.2+) and ninja +* Meson (version 0.57+) and ninja * ``meson`` & ``ninja-build`` packages in most Linux distributions * If the packaged version is below the minimum version, the latest versions diff --git a/doc/guides/prog_guide/build-sdk-meson.rst b/doc/guides/prog_guide/build-sdk-meson.rst index 93aa1f80e3..fdb5d484fa 100644 --- a/doc/guides/prog_guide/build-sdk-meson.rst +++ b/doc/guides/prog_guide/build-sdk-meson.rst @@ -35,7 +35,7 @@ The ``meson`` tool is used to configure a DPDK build. On most Linux distributions this can be got using the local package management system, e.g. ``dnf install meson`` or ``apt-get install meson``. If meson is not available as a suitable package, it can also be installed using the Python -3 ``pip`` tool, e.g. ``pip3 install meson``. Version 0.53.2 or later of meson is +3 ``pip`` tool, e.g. ``pip3 install meson``. Version 0.57 or later of meson is required - if the version packaged is too old, the latest version is generally available from "pip". diff --git a/meson.build b/meson.build index 8b248d4505..69888834b4 100644 --- a/meson.build +++ b/meson.build @@ -13,7 +13,7 @@ project('DPDK', 'c', 'default_library=static', 'warning_level=2', ], - meson_version: '>= 0.53.2' + meson_version: '>= 0.57' ) # check for developer mode From patchwork Fri Sep 20 12:57:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 144355 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 680E54599D; Fri, 20 Sep 2024 14:58:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A26954342E; Fri, 20 Sep 2024 14:57:56 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by mails.dpdk.org (Postfix) with ESMTP id 5D50E4342A; Fri, 20 Sep 2024 14:57:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1726837076; x=1758373076; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Afx/cMEHKyBWvM7aD/8BdZfAmRo27Le6KgQfxtD6AHE=; b=gPWV9zhj2yQunFXCD2lMNQSbjntCu68hf4mYOERl46Er6Tnrxa5Ie8lK GerAhDNtBNZUrGlAbf83X1M3RVafI3Z5W79inXQK/EhJyQXwopmFJwvnM g17LAqWWFzCBkCzEiMPq8XAWILZEg/TzdR47ty/Uoby4d2PRHCdCL3RuT R+E1bcq2X/9lRp9nwoZIfkc5wGZ1NYkVPB+LizGdDP3DxAIqkPj3V0rsZ h/ealQFs3J/ssesLJSwkSTF3Mu/LlhoKk//7rVbkuO31WysxTjiCnJ00p YUL7/8aV7DwDcYdCzVygy+ccQShldiTV7Ag2YQ1PMP7hrlJDbxAMScQwY g==; X-CSE-ConnectionGUID: JTRdbDRGRhyvzL4msKAzNA== X-CSE-MsgGUID: kQipLDEMSB+nt2HhhKaWEQ== X-IronPort-AV: E=McAfee;i="6700,10204,11200"; a="25991097" X-IronPort-AV: E=Sophos;i="6.10,244,1719903600"; d="scan'208";a="25991097" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Sep 2024 05:57:55 -0700 X-CSE-ConnectionGUID: J+qvfOhQScixzS8NvL09AA== X-CSE-MsgGUID: Fu252Bv0Q7qcNZdrL6Gdkg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,244,1719903600"; d="scan'208";a="71135909" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa008.jf.intel.com with ESMTP; 20 Sep 2024 05:57:54 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: mb@smartsharesystems.com, thomas@monjalon.net, david.marchand@redhat.com, Bruce Richardson , stable@dpdk.org Subject: [PATCH 2/5] build: remove version check on compiler links function Date: Fri, 20 Sep 2024 13:57:34 +0100 Message-ID: <20240920125737.1197969-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240920125737.1197969-1-bruce.richardson@intel.com> References: <20240920125737.1197969-1-bruce.richardson@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The "compiler.links()" function meson documentation [1] is a little unclear, in a casual reading implies that the function was new in 0.60 meson release. In fact, it is only enhanced as described in that release, but is present earlier. As such, we can remove the version checks preceeding the calls to links function in our code. [1] https://mesonbuild.com/Reference-manual_returned_compiler.html#compilerlinks Fixes: fd809737cf8c ("common/qat: fix build with incompatible IPsec library") Fixes: fb94d8243894 ("crypto/ipsec_mb: add dependency check for cross build") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Reviewed-by: Robin Jarry --- drivers/common/qat/meson.build | 2 +- drivers/crypto/ipsec_mb/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/common/qat/meson.build b/drivers/common/qat/meson.build index 3893b127dd..5a8de16fe0 100644 --- a/drivers/common/qat/meson.build +++ b/drivers/common/qat/meson.build @@ -43,7 +43,7 @@ else IMB_required_ver = '1.4.0' IMB_header = '#include' libipsecmb = cc.find_library('IPSec_MB', required: false) - if libipsecmb.found() and meson.version().version_compare('>=0.60') and cc.links( + if libipsecmb.found() and cc.links( 'int main(void) {return 0;}', dependencies: libipsecmb) # version comes with quotes, so we split based on " and take the middle imb_ver = cc.get_define('IMB_VERSION_STR', diff --git a/drivers/crypto/ipsec_mb/meson.build b/drivers/crypto/ipsec_mb/meson.build index 87bf965554..81631d3050 100644 --- a/drivers/crypto/ipsec_mb/meson.build +++ b/drivers/crypto/ipsec_mb/meson.build @@ -17,7 +17,7 @@ if not lib.found() build = false reason = 'missing dependency, "libIPSec_MB"' # if the lib is found, check it's the right format -elif meson.version().version_compare('>=0.60') and not cc.links( +elif not cc.links( 'int main(void) {return 0;}', dependencies: lib) build = false reason = 'incompatible dependency, "libIPSec_MB"' From patchwork Fri Sep 20 12:57:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 144356 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 162374599D; Fri, 20 Sep 2024 14:58:12 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2306F4343B; Fri, 20 Sep 2024 14:58:01 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by mails.dpdk.org (Postfix) with ESMTP id 384CA43430 for ; Fri, 20 Sep 2024 14:57:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1726837080; x=1758373080; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ompj9cTybSBa5U5HxWg4HynTDtGB59zWHBRDTm4mdJA=; b=fEyuSkaYrZ+034RaEqNg9BgvFaslzrtWyFTSjhJXA5YCgQFxU/z56yLc 79FACmP3nuM6l6W6WEYk2/yb/si0IPKGy1x17fS0OiePcXbDRnGmQt3aO LZ8DuUnUcWsfLTd/WoCrbVupl4Wxv16RqzZtw1ZfM5IBm2/qAybgKZh7Y IJuXavOfmbE8hISRsD/SpJrB3NPl4ppUMtKLZZM3lQnAKzjQxEDvDSNnY VP25pEsTOiiP1lyOviuV1KTly2Hy80q7WqSYqhCgyLmcPpiUYchxJI028 Wajyn0u5Gs2LQRyyuhRXtpRYAy6KKYj2dEsVSlx33GAr7HgHYWvQ0CRZl Q==; X-CSE-ConnectionGUID: JpHh4CF1RR2hSowsm7VriA== X-CSE-MsgGUID: TP3x4XzoSVWCaE88tzfVNw== X-IronPort-AV: E=McAfee;i="6700,10204,11200"; a="25991103" X-IronPort-AV: E=Sophos;i="6.10,244,1719903600"; d="scan'208";a="25991103" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Sep 2024 05:57:59 -0700 X-CSE-ConnectionGUID: dJ+VzMXsSKWURhPcui8VEQ== X-CSE-MsgGUID: X7RA/mVpRdGrjtujfLi7FQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,244,1719903600"; d="scan'208";a="71135912" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa008.jf.intel.com with ESMTP; 20 Sep 2024 05:57:58 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: mb@smartsharesystems.com, thomas@monjalon.net, david.marchand@redhat.com, Bruce Richardson Subject: [PATCH 3/5] build: remove unnecessary version checks Date: Fri, 20 Sep 2024 13:57:35 +0100 Message-ID: <20240920125737.1197969-4-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240920125737.1197969-1-bruce.richardson@intel.com> References: <20240920125737.1197969-1-bruce.richardson@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Since minimum meson version is now 0.57 we can remove all version checks for versions lower than that. Signed-off-by: Bruce Richardson Reviewed-by: Robin Jarry --- config/meson.build | 2 +- doc/api/meson.build | 2 +- drivers/meson.build | 3 --- lib/meson.build | 6 ------ 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/config/meson.build b/config/meson.build index 8c8b019c25..913825b1ca 100644 --- a/config/meson.build +++ b/config/meson.build @@ -97,7 +97,7 @@ eal_pmd_path = join_paths(get_option('prefix'), driver_install_path) if not is_windows meson.add_install_script('../buildtools/symlink-drivers-solibs.sh', get_option('libdir'), pmd_subdir_opt) -elif meson.version().version_compare('>=0.55.0') +else # 0.55.0 is required to use external program with add_install_script meson.add_install_script(py3, files('../buildtools/symlink-drivers-solibs.py'), diff --git a/doc/api/meson.build b/doc/api/meson.build index 5b50692df9..404c145672 100644 --- a/doc/api/meson.build +++ b/doc/api/meson.build @@ -97,6 +97,6 @@ doc_target_names += 'Doxygen_API(Manpage)' # refresh the manpage database on install # if DPDK manpages are installed to a staging directory, not in MANPATH, this has no effect mandb = find_program('mandb', required: false) -if mandb.found() and get_option('enable_docs') and meson.version().version_compare('>=0.55.0') +if mandb.found() and get_option('enable_docs') meson.add_install_script(mandb) endif diff --git a/drivers/meson.build b/drivers/meson.build index 66931d4241..1cb98e9354 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -280,9 +280,6 @@ foreach subpath:subdirs lk_deps += [def_file] lk_args = ['-Wl,/def:' + def_file.full_path()] - if meson.version().version_compare('<0.54.0') - lk_args += ['-Wl,/implib:drivers\\lib' + lib_name + '.dll.a'] - endif else mingw_map = custom_target(lib_name + '_mingw', command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'], diff --git a/lib/meson.build b/lib/meson.build index 162287753f..ce92cb5537 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -276,14 +276,8 @@ foreach l:libraries if is_ms_compiler lk_args = ['/def:' + def_file.full_path()] - if meson.version().version_compare('<0.54.0') - lk_args += ['/implib:lib\\librte_' + l + '.dll.a'] - endif else lk_args = ['-Wl,/def:' + def_file.full_path()] - if meson.version().version_compare('<0.54.0') - lk_args += ['-Wl,/implib:lib\\librte_' + l + '.dll.a'] - endif endif else if is_windows From patchwork Fri Sep 20 12:57:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 144357 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 663964599D; Fri, 20 Sep 2024 14:58:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6DAC143440; Fri, 20 Sep 2024 14:58:05 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by mails.dpdk.org (Postfix) with ESMTP id D60CA43437 for ; Fri, 20 Sep 2024 14:58:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1726837084; x=1758373084; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Y8aizJhlW7UlWfT2HCIzDeJvlOy+9ZhayKRGyukrPeg=; b=nOUuJa+xbrHolorDS1xVPLTM5UCBM+gnJYYlWIFH0BsOdjd9VEvg5NWF m/kb8um8SMK887Dg8OuZpR1ON75xDGy86YaM57OuYBaBK6pv0+fkbzfY5 VRkQ22k4D+BEthLJKjrif9gWMWteAYn2WxR8iiAiTomtX8GpdoXsU89/H TnAfEiO+F3RCdMLdhgOkuWMaJuG/jmxg5PD5UWdbkwpwH49Z6EJ2xpsst Hi1DXE3IAcOMKT0k/gYFhgGTeWEgSF9UQjLePjg1PphXv74DmcBFAOqjC Q1u+hzhZNbuT6sJSHaelZK14UZtOhOoKbAAvaydIfvU0TNcobomE1MQLE A==; X-CSE-ConnectionGUID: yhGiergUSBO41lqwV4ATZA== X-CSE-MsgGUID: 65J3dBEbQji6pvRYZqqMmQ== X-IronPort-AV: E=McAfee;i="6700,10204,11200"; a="25991108" X-IronPort-AV: E=Sophos;i="6.10,244,1719903600"; d="scan'208";a="25991108" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Sep 2024 05:58:04 -0700 X-CSE-ConnectionGUID: kvtm5eHeR6e0JWeAEHA47w== X-CSE-MsgGUID: x/B/PVIzTr6gMahe6ik59Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,244,1719903600"; d="scan'208";a="71135918" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa008.jf.intel.com with ESMTP; 20 Sep 2024 05:58:03 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: mb@smartsharesystems.com, thomas@monjalon.net, david.marchand@redhat.com, Bruce Richardson Subject: [PATCH 4/5] build: use version file support from meson Date: Fri, 20 Sep 2024 13:57:36 +0100 Message-ID: <20240920125737.1197969-5-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240920125737.1197969-1-bruce.richardson@intel.com> References: <20240920125737.1197969-1-bruce.richardson@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Rather than having to use run_command to shell out and read the VERSION file for the DPDK version, we can use the support added directly to meson in version 0.57. Signed-off-by: Bruce Richardson Reviewed-by: Robin Jarry --- meson.build | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 69888834b4..fe9040369a 100644 --- a/meson.build +++ b/meson.build @@ -2,10 +2,7 @@ # Copyright(c) 2017-2019 Intel Corporation project('DPDK', 'c', - # Get version number from file. - # Fallback to "more" for Windows compatibility. - version: run_command(find_program('cat', 'more'), - files('VERSION'), check: true).stdout().strip(), + version: files('VERSION'), license: 'BSD', default_options: [ 'buildtype=release', From patchwork Fri Sep 20 12:57:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 144358 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6F8084599D; Fri, 20 Sep 2024 14:58:31 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1BCC04344F; Fri, 20 Sep 2024 14:58:09 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by mails.dpdk.org (Postfix) with ESMTP id 4C9D543437 for ; Fri, 20 Sep 2024 14:58:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1726837088; x=1758373088; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ptwBbSxRk6i3gqBUYCdQaWWQK93rtrL6+384B2w4xGo=; b=CJwBirN5/dAiBA2eVJx/XbNfi4NOBJC4R9wj8AMOlwrc5uKLH2PiOUpA mfHGB1dpopJrcv5nLxqg+mc8VQv2eHeNjuNbbDP4vbiYgT5ZYR6JJul8l GgZZxkeKmhVudNJAIFm4KXvEwlqsXyA9+AgRZbpfVXms+Q6/LxDwIY3G/ 0quZDh/XTB7nbxQ9iIaZaag6kvMKhzdiqddPGwKRSVmx18VdAKp+/4tJq n/bqnVIga0hA1tDZaQ0elqr0ZqQGKq/5UAATIgMiVneB3R3OdG+i4b+Z+ RE5XzlA7Fh8v7qIpXo9uDEQXvadcPGQifGOdVeFLNWVBJzuIqzwp/RAzs w==; X-CSE-ConnectionGUID: 7fX9kYgCSCqr9/b7GsP/HQ== X-CSE-MsgGUID: yOK5jvbRTUKyQlhwnAPTNw== X-IronPort-AV: E=McAfee;i="6700,10204,11200"; a="25991113" X-IronPort-AV: E=Sophos;i="6.10,244,1719903600"; d="scan'208";a="25991113" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Sep 2024 05:58:07 -0700 X-CSE-ConnectionGUID: 5D3pKZ02TjyieZhFmA9YSQ== X-CSE-MsgGUID: RTYjU+e/QQKw/TJARgS6GQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,244,1719903600"; d="scan'208";a="71135921" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa008.jf.intel.com with ESMTP; 20 Sep 2024 05:58:06 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: mb@smartsharesystems.com, thomas@monjalon.net, david.marchand@redhat.com, Bruce Richardson Subject: [PATCH 5/5] build: replace deprecated meson function Date: Fri, 20 Sep 2024 13:57:37 +0100 Message-ID: <20240920125737.1197969-6-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240920125737.1197969-1-bruce.richardson@intel.com> References: <20240920125737.1197969-1-bruce.richardson@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The meson function "get_cross_property" is deprecated in meson 0.58 and should be replaced by "get_external_property". Signed-off-by: Bruce Richardson Reviewed-by: Robin Jarry --- config/arm/meson.build | 4 ++-- config/meson.build | 6 +++--- config/riscv/meson.build | 4 ++-- drivers/event/cnxk/meson.build | 2 +- drivers/meson.build | 4 ++-- drivers/net/cnxk/meson.build | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/arm/meson.build b/config/arm/meson.build index 012935d5d7..6ef91d3a1a 100644 --- a/config/arm/meson.build +++ b/config/arm/meson.build @@ -717,7 +717,7 @@ if dpdk_conf.get('RTE_ARCH_32') dpdk_conf.set('RTE_CACHE_LINE_SIZE', 64) if meson.is_cross_build() update_flags = true - soc = meson.get_cross_property('platform', '') + soc = meson.get_external_property('platform', '') if soc == '' error('Arm SoC must be specified in the cross file.') endif @@ -772,7 +772,7 @@ else endif else # cross build - soc = meson.get_cross_property('platform', '') + soc = meson.get_external_property('platform', '') if soc == '' error('Arm SoC must be specified in the cross file.') endif diff --git a/config/meson.build b/config/meson.build index 913825b1ca..869f7605e8 100644 --- a/config/meson.build +++ b/config/meson.build @@ -227,7 +227,7 @@ endif # check for libraries used in multiple places in DPDK has_libnuma = false find_libnuma = true -if meson.is_cross_build() and not meson.get_cross_property('numa', true) +if meson.is_cross_build() and not meson.get_external_property('numa', true) # don't look for libnuma if explicitly disabled in cross build find_libnuma = false endif @@ -377,12 +377,12 @@ dpdk_conf.set('RTE_COMPILE_TIME_CPUFLAGS', ','.join(compile_time_cpuflags)) # apply cross-specific options if meson.is_cross_build() # configure RTE_MAX_LCORE and RTE_MAX_NUMA_NODES from cross file - cross_max_lcores = meson.get_cross_property('max_lcores', 0) + cross_max_lcores = meson.get_external_property('max_lcores', 0) if cross_max_lcores != 0 message('Setting RTE_MAX_LCORE from cross file') dpdk_conf.set('RTE_MAX_LCORE', cross_max_lcores) endif - cross_max_numa_nodes = meson.get_cross_property('max_numa_nodes', 0) + cross_max_numa_nodes = meson.get_external_property('max_numa_nodes', 0) if cross_max_numa_nodes != 0 message('Setting RTE_MAX_NUMA_NODES from cross file') dpdk_conf.set('RTE_MAX_NUMA_NODES', cross_max_numa_nodes) diff --git a/config/riscv/meson.build b/config/riscv/meson.build index 07d7d9da23..7562c6cb99 100644 --- a/config/riscv/meson.build +++ b/config/riscv/meson.build @@ -84,8 +84,8 @@ if not meson.is_cross_build() endif else # cross build - vendor_id = meson.get_cross_property('vendor_id') - arch_id = meson.get_cross_property('arch_id') + vendor_id = meson.get_external_property('vendor_id') + arch_id = meson.get_external_property('arch_id') endif if not vendors.has_key(vendor_id) diff --git a/drivers/event/cnxk/meson.build b/drivers/event/cnxk/meson.build index e0e350570d..2c1060ad87 100644 --- a/drivers/event/cnxk/meson.build +++ b/drivers/event/cnxk/meson.build @@ -9,7 +9,7 @@ if not is_linux or not dpdk_conf.get('RTE_ARCH_64') endif if meson.is_cross_build() - soc_type = meson.get_cross_property('platform', '') + soc_type = meson.get_external_property('platform', '') else soc_type = platform endif diff --git a/drivers/meson.build b/drivers/meson.build index 1cb98e9354..2733306698 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -32,8 +32,8 @@ subdirs = [ ] if meson.is_cross_build() - disable_drivers += ',' + meson.get_cross_property('disable_drivers', '') - enable_drivers += ',' + meson.get_cross_property('enable_drivers', '') + disable_drivers += ',' + meson.get_external_property('disable_drivers', '') + enable_drivers += ',' + meson.get_external_property('enable_drivers', '') endif # add cmdline disabled drivers and meson disabled drivers together diff --git a/drivers/net/cnxk/meson.build b/drivers/net/cnxk/meson.build index 7bce80098a..4506ce9306 100644 --- a/drivers/net/cnxk/meson.build +++ b/drivers/net/cnxk/meson.build @@ -9,7 +9,7 @@ if not dpdk_conf.get('RTE_ARCH_64') endif if meson.is_cross_build() - soc_type = meson.get_cross_property('platform', '') + soc_type = meson.get_external_property('platform', '') else soc_type = platform endif