From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9E6CEA04C1; Sat, 23 Nov 2019 04:25:39 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DA0C72952; Sat, 23 Nov 2019 04:25:38 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 249B091 for ; Sat, 23 Nov 2019 04:25:36 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Nov 2019 19:25:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,232,1571727600"; d="scan'208";a="201734058" Received: from win-dpdk-pallavi.jf.intel.com (HELO localhost.localdomain) ([10.166.188.58]) by orsmga008.jf.intel.com with ESMTP; 22 Nov 2019 19:25:33 -0800 From: Pallavi Kadam To: dev@dpdk.org, thomas@monjalon.net Cc: bruce.richardson@intel.com, ranjit.menon@intel.com, pallavi.kadam@intel.com Date: Fri, 22 Nov 2019 18:59:59 -0800 Message-Id: <20191123025959.17040-1-pallavi.kadam@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 Subject: [dpdk-dev] [PATCH] build: fix windows build failure for 19.11 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" This patch fixes Windows build failure caused due to 'config: change ABI versioning to global' patch. This patch can be merged in 19.11 release. Signed-off-by: Bruce Richardson Reviewed-by: Ranjit Menon Tested-by: Pallavi Kadam --- config/meson.build | 2 +- meson.build | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/meson.build b/config/meson.build index 3ffb73ab9..364a8d739 100644 --- a/config/meson.build +++ b/config/meson.build @@ -19,7 +19,7 @@ endforeach pver = meson.project_version().split('.') major_version = '@0@.@1@'.format(pver.get(0), pver.get(1)) abi_version = run_command(find_program('cat', 'more'), - files('../ABI_VERSION')).stdout().strip() + abi_version_file).stdout().strip() # experimental libraries are versioned as 0.majorminor versions, e.g. 0.201 ever = abi_version.split('.') experimental_abi_version = '0.@0@@1@'.format(ever.get(0), ever.get(1)) diff --git a/meson.build b/meson.build index c5a3dda26..b7ae9c8d9 100644 --- a/meson.build +++ b/meson.build @@ -22,6 +22,7 @@ dpdk_extra_ldflags = [] dpdk_app_link_libraries = [] dpdk_libs_disabled = [] dpdk_drvs_disabled = [] +abi_version_file = files('ABI_VERSION') # configure the build, and make sure configs here and in config folder are # able to be included in any file. We also store a global array of include dirs -- 2.18.0.windows.1