DPDK patches and discussions
 help / color / mirror / Atom feed
From: Pallavi Kadam <pallavi.kadam@intel.com>
To: dev@dpdk.org, thomas@monjalon.net
Cc: bruce.richardson@intel.com, ranjit.menon@intel.com,
	pallavi.kadam@intel.com
Subject: [dpdk-dev] [PATCH] build: fix windows build failure for 19.11
Date: Fri, 22 Nov 2019 18:59:59 -0800	[thread overview]
Message-ID: <20191123025959.17040-1-pallavi.kadam@intel.com> (raw)

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 <bruce.richardson@intel.com>
Reviewed-by: Ranjit Menon <ranjit.menon@intel.com>
Tested-by: Pallavi Kadam <pallavi.kadam@intel.com>
---
 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


             reply	other threads:[~2019-11-23  3:25 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-23  2:59 Pallavi Kadam [this message]
2019-11-25  9:59 ` Bruce Richardson
2019-11-25 13:05 ` Burakov, Anatoly
2019-11-25 13:58   ` David Marchand
2019-11-25 14:16     ` David Marchand

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191123025959.17040-1-pallavi.kadam@intel.com \
    --to=pallavi.kadam@intel.com \
    --cc=bruce.richardson@intel.com \
    --cc=dev@dpdk.org \
    --cc=ranjit.menon@intel.com \
    --cc=thomas@monjalon.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).