From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 667F9A00C5; Tue, 15 Feb 2022 18:30:48 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CE26C4114E; Tue, 15 Feb 2022 18:30:45 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id EC7FB4114B for ; Tue, 15 Feb 2022 18:30:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1644946244; x=1676482244; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=IXu1Hu5qW23B+EnVO4mrQKRCYqrzNFWQhna6Lrg8rMw=; b=WHjw6usFgX0bC4aWU6z91Iesm7ixGqrEL8pbZ2lfEepgC+x4aRrteUkk EbH+CL2Y+Eh7dtR70HMnCLiQHRpW6ZXwoRenqffRLw+cTXryHjxiT4jHx 7h3z3TGngvxZg7/fjQNntYV5fy25KczueoctNawWgIlygHjLZDFca1xPB xITq/iTaIxU5XEFUMNMvps3ky9QZbChK+BUFwq3LDo79zpXZJrMIqqGpA smhGJFKrhKBkcZM3xbRlQZMyKMQleAXx8jt+FGFCMDtdeE/QMbv9Sgdyz r4BE3zw02H3qeB7XvMrgi7YkFs2b4L3QQVoAJvuRt56GSkD3T735pPjV5 g==; X-IronPort-AV: E=McAfee;i="6200,9189,10259"; a="250608799" X-IronPort-AV: E=Sophos;i="5.88,371,1635231600"; d="scan'208";a="250608799" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2022 09:30:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,371,1635231600"; d="scan'208";a="570927428" Received: from silpixa00399126.ir.intel.com ([10.237.223.192]) by orsmga001.jf.intel.com with ESMTP; 15 Feb 2022 09:30:42 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Subject: [PATCH 2/3] buildtools/chkincs: check sdk headers for C++ compatibility Date: Tue, 15 Feb 2022 17:30:28 +0000 Message-Id: <20220215173029.1893710-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220215173029.1893710-1-bruce.richardson@intel.com> References: <20220215173029.1893710-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 With a one-line change to the lib meson.build file we can add the sdk headers to the list of files to be checked using the chkincs binary. Unfortunately, many of those sdk header depend upon headers in the PCI and vdev bus drivers, so we need to update chkincs build to ensure those dependencies are added. We also need to allow internal APIs to be present in these SDK headers. Signed-off-by: Bruce Richardson --- buildtools/chkincs/meson.build | 6 +++++- lib/meson.build | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/buildtools/chkincs/meson.build b/buildtools/chkincs/meson.build index 790f700619..9442235200 100644 --- a/buildtools/chkincs/meson.build +++ b/buildtools/chkincs/meson.build @@ -13,11 +13,15 @@ gen_c_files = generator(gen_c_file_for_header, cflags = machine_args cflags += '-DALLOW_EXPERIMENTAL_API' +cflags += '-DALLOW_INTERNAL_API' sources = files('main.c') sources += gen_c_files.process(dpdk_chkinc_headers) -deps = [] +# some driver sdk headers depend on these two buses, which are mandatory in build +# so we always include them in deps list +deps = [get_variable('shared_rte_bus_vdev'), get_variable('shared_rte_bus_pci')] +# add the rest of the libs to the dependencies foreach l:enabled_libs deps += get_variable('shared_rte_' + l) endforeach diff --git a/lib/meson.build b/lib/meson.build index 8e5acd7819..24adbe44c9 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -171,6 +171,7 @@ foreach l:libraries install_headers(driver_sdk_headers) endif dpdk_chkinc_headers += headers + dpdk_chkinc_headers += driver_sdk_headers libname = 'rte_' + name includes += include_directories(l) -- 2.32.0