From patchwork Wed Jan 31 17:42:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 34789 X-Patchwork-Delegate: bruce.richardson@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 660A61B7F3; Wed, 31 Jan 2018 18:43:05 +0100 (CET) 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) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Jan 2018 09:43:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,441,1511856000"; d="scan'208";a="200165601" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga005.fm.intel.com with ESMTP; 31 Jan 2018 09:43:01 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Wed, 31 Jan 2018 17:42:44 +0000 Message-Id: <20180131174249.257933-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180131174249.257933-1-bruce.richardson@intel.com> References: <20180131174249.257933-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH 1/6] eal/bsdapp: fix building kernel modules 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" 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