From patchwork Fri Mar 10 11:11:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 125007 X-Patchwork-Delegate: thomas@monjalon.net 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 3D94A41E64; Fri, 10 Mar 2023 12:11:59 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1177540FAE; Fri, 10 Mar 2023 12:11:58 +0100 (CET) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id ECDD540685 for ; Fri, 10 Mar 2023 12:11:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678446717; x=1709982717; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sHlQnShio0ExQXl2nlqDK9pcdlih3d5K7nI/XyjgQfo=; b=gSFaskP5MVQRn9P2s7LmycKmPYeCV5TTj9JlR8gZOnbq6SxkIYrtODGG gSH8BtNMQ6gIBpO5jCKGnxGEKxmj71zBiRuB2UXSyJuWshsMqkQS/h+AN h0lFacNbjzxVnfP0yk9bRxVLB5k3pORtJnqvdTs6aGiHoWlUov7NIYUyA s5BjV0ioz+271qKXQlw7NO31iITOTd10D6CSN4ezZAYe2asen+1UfeFxT xFhX6Gy690dne/EzObLw4rf9D3yMq9668EwPdaHr4nrqzSziI7QOXdBAo VldWBYsl09WDbbBjPDCNyA4C65JZ6ChITQZHbQXnwfxOPtqQ3kkVo3dfy g==; X-IronPort-AV: E=McAfee;i="6500,9779,10644"; a="399303564" X-IronPort-AV: E=Sophos;i="5.98,249,1673942400"; d="scan'208";a="399303564" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2023 03:11:56 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10644"; a="923640260" X-IronPort-AV: E=Sophos;i="5.98,249,1673942400"; d="scan'208";a="923640260" Received: from silpixa00401385.ir.intel.com ([10.237.214.22]) by fmsmga006.fm.intel.com with ESMTP; 10 Mar 2023 03:11:55 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Subject: [PATCH 23.07 1/2] build: fix case of project language name Date: Fri, 10 Mar 2023 11:11:37 +0000 Message-Id: <20230310111138.92282-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230310111138.92282-1-bruce.richardson@intel.com> References: <20230310111138.92282-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 According to the meson manual [1], the project language should be given as 'c', rather than 'C' in the initial "project" function call. While meson itself does not complain about this, the "muon" project, which attempts to re-implement meson in C, does complain. /home/bruce/dpdk/meson.build:4:17: error 'C' is not a valid language 4 | project('DPDK', 'C', ^ [1] https://mesonbuild.com/Reference-manual_functions.html#project Fixes: a25a650be5f0 ("build: add infrastructure for meson and ninja builds") Signed-off-by: Bruce richardson Reviewed-by: Tyler Retzlaff --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index f91d652bc5..992ca91e88 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017-2019 Intel Corporation -project('DPDK', 'C', +project('DPDK', 'c', # Get version number from file. # Fallback to "more" for Windows compatibility. version: run_command(find_program('cat', 'more'), From patchwork Fri Mar 10 11:11:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 125008 X-Patchwork-Delegate: thomas@monjalon.net 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 23E1A41E64; Fri, 10 Mar 2023 12:12:05 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4482641144; Fri, 10 Mar 2023 12:12:01 +0100 (CET) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id 726474113D for ; Fri, 10 Mar 2023 12:11:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678446719; x=1709982719; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=U6pe4c5VuWdvVbzN9ACuYEIFB5uRVPHFIZmD0EETOVQ=; b=iJX1oRFUkaS+prW31xr7/FrHsiZ6RgOibExP7tYrlbIVuBy5NU6E8UO5 xSLUV30ASgeW3cknX6yU3KLs2SoprXZg4T/Ipd5xgLt8k2EC/8+mpfFIT ba+0gz6Qlmsya4L2HwV5YkMfOQdWmz4dKL6T3v5bZqmwCIsAr7i2vE2PU xPSc1R0VukR91pkhhDjTn/NmZKKtlsIdMbxDkRVeljbW745u+anPQJ6jn 6BSGXdFSWx+gOLOH/KzUdSbYr1B9wCMFB7S5pmFEfgYIaYsF1zllCe1jG +USAeddttgDS6kB3df4+mOwKgke9y9JyDG1oazNoyVpqbFpcnVETK5mLM w==; X-IronPort-AV: E=McAfee;i="6500,9779,10644"; a="399303579" X-IronPort-AV: E=Sophos;i="5.98,249,1673942400"; d="scan'208";a="399303579" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2023 03:11:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10644"; a="923640430" X-IronPort-AV: E=Sophos;i="5.98,249,1673942400"; d="scan'208";a="923640430" Received: from silpixa00401385.ir.intel.com ([10.237.214.22]) by fmsmga006.fm.intel.com with ESMTP; 10 Mar 2023 03:11:58 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Subject: [PATCH 23.07 2/2] build: explicitly track file paths in current directory Date: Fri, 10 Mar 2023 11:11:38 +0000 Message-Id: <20230310111138.92282-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230310111138.92282-1-bruce.richardson@intel.com> References: <20230310111138.92282-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 To ensure proper path tracking for files being used by the build, the "files()" function should always be used. While meson currently assumes that bare filenames passed to commands refer to paths in the current directory, other reimplementations of meson, e.g. muon, require the paths to be properly tracked. Therefore, for resiliency, ensure all paths are specified using "files()". Signed-off-by: Bruce Richardson Reviewed-by: Tyler Retzlaff --- app/test/meson.build | 2 +- buildtools/pkg-config/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.37.2 diff --git a/app/test/meson.build b/app/test/meson.build index 2db5ccf4ff..94233fafca 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -470,7 +470,7 @@ dpdk_test = executable('dpdk-test', driver_install_path), install: true) -has_hugepage = run_command(py3, 'has_hugepage.py', check: true).stdout().strip() != '0' +has_hugepage = run_command(py3, files('has_hugepage.py'), check: true).stdout().strip() != '0' message('hugepage availability: @0@'.format(has_hugepage)) # some perf tests (eg: memcpy perf autotest)take very long diff --git a/buildtools/pkg-config/meson.build b/buildtools/pkg-config/meson.build index 0412883c8f..b36add17e3 100644 --- a/buildtools/pkg-config/meson.build +++ b/buildtools/pkg-config/meson.build @@ -56,4 +56,4 @@ This is required for a number of static inline functions in the public headers.' # For static linking with dependencies as shared libraries, # the internal static libraries must be flagged explicitly. -run_command(py3, 'set-static-linker-flags.py', check: true) +run_command(py3, files('set-static-linker-flags.py'), check: true)