From: Bruce Richardson Subject: [PATCH 1/6] eal/bsdapp: fix building kernel modules Date: Wed, 31 Jan 2018 17:42:44 +0000 Message-ID: <20180131174249.257933-2-bruce.richardson@intel.com> References: <20180131174249.257933-1-bruce.richardson@intel.com> Cc: Bruce Richardson To: dev@dpdk.org Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 702BD1B7F3 for ; Wed, 31 Jan 2018 18:43:02 +0100 (CET) In-Reply-To: <20180131174249.257933-1-bruce.richardson@intel.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 --- 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