DPDK patches and discussions
 help / color / mirror / Atom feed
From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>
Subject: [dpdk-dev] [PATCH 1/6] eal/bsdapp: fix building kernel modules
Date: Wed, 31 Jan 2018 17:42:44 +0000	[thread overview]
Message-ID: <20180131174249.257933-2-bruce.richardson@intel.com> (raw)
In-Reply-To: <20180131174249.257933-1-bruce.richardson@intel.com>

The kernel module source file directory passed via VPATH was wrong,
which caused the source files to be not found via make. Rather than
explicitly passing VPATH, make use of the fact that the full path
to the source files is passed by meson, so split that into directory
part - to be used as VPATH - and file part - to be used as the source
filename.

Fixes: 610beca42ea4 ("build: remove library special cases")

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 lib/librte_eal/bsdapp/BSDmakefile.meson | 1 +
 lib/librte_eal/meson.build              | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_eal/bsdapp/BSDmakefile.meson b/lib/librte_eal/bsdapp/BSDmakefile.meson
index 2f16ac05b..42f5b2b9d 100644
--- a/lib/librte_eal/bsdapp/BSDmakefile.meson
+++ b/lib/librte_eal/bsdapp/BSDmakefile.meson
@@ -36,6 +36,7 @@
 # source file is passed via KMOD_SRC as full path, we only use final
 # component of it, as VPATH is used to find actual file, so as to
 # have the .o files placed in the build, not source directory
+VPATH = ${KMOD_SRC:H}
 SRCS = ${KMOD_SRC:T} device_if.h bus_if.h pci_if.h
 CFLAGS += $(KMOD_CFLAGS)
 
diff --git a/lib/librte_eal/meson.build b/lib/librte_eal/meson.build
index 6fb2ef17f..d9ba38533 100644
--- a/lib/librte_eal/meson.build
+++ b/lib/librte_eal/meson.build
@@ -36,7 +36,6 @@ elif host_machine.system() == 'freebsd'
 			command: ['make', '-f', '@INPUT0@',
 				'KMOD_SRC=@INPUT1@',
 				'KMOD=' + k,
-				'VPATH=' + join_paths(meson.current_source_dir(), k),
 				'KMOD_CFLAGS=' + ' '.join(kmod_cflags)],
 			build_by_default: get_option('enable_kmods'))
 	endforeach
-- 
2.14.1

  reply	other threads:[~2018-01-31 17:43 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-31 17:42 [dpdk-dev] [PATCH 0/6] Fix meson build on FreeBSD Bruce Richardson
2018-01-31 17:42 ` Bruce Richardson [this message]
2018-01-31 17:42 ` [dpdk-dev] [PATCH 2/6] build: add dependency on execinfo for BSD meson builds Bruce Richardson
2018-01-31 17:42 ` [dpdk-dev] [PATCH 3/6] test/test: mark tests as skipped when required lib not available Bruce Richardson
2018-02-01 16:32   ` Hunt, David
2018-01-31 17:42 ` [dpdk-dev] [PATCH 4/6] test/test: fix dependency on power lib for BSD meson build Bruce Richardson
2018-01-31 17:42 ` [dpdk-dev] [PATCH 5/6] test/test: fix dependency on KNI " Bruce Richardson
2018-01-31 17:42 ` [dpdk-dev] [PATCH 6/6] examples: fix meson build on FreeBSD Bruce Richardson
2018-02-01 14:20 ` [dpdk-dev] [PATCH v2 0/5] Fix " Bruce Richardson
2018-02-01 14:20   ` [dpdk-dev] [PATCH v2 1/5] eal/bsdapp: fix building kernel modules Bruce Richardson
2018-02-01 14:20   ` [dpdk-dev] [PATCH v2 2/5] build: fix dependency on execinfo for BSD meson builds Bruce Richardson
2018-02-01 14:20   ` [dpdk-dev] [PATCH v2 3/5] test/test: mark tests as skipped when required lib not available Bruce Richardson
2018-02-01 14:20   ` [dpdk-dev] [PATCH v2 4/5] test/test: fix dependency on power lib for BSD meson build Bruce Richardson
2018-02-01 14:20   ` [dpdk-dev] [PATCH v2 5/5] test/test: fix dependency on KNI " Bruce Richardson
2018-02-02 11:11   ` [dpdk-dev] [PATCH v2 0/5] Fix meson build on FreeBSD Bruce Richardson

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=20180131174249.257933-2-bruce.richardson@intel.com \
    --to=bruce.richardson@intel.com \
    --cc=dev@dpdk.org \
    /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).