From patchwork Tue Oct 17 16:41:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 30492 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 630251B66C; Tue, 17 Oct 2017 18:41:35 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 50C001B32F for ; Tue, 17 Oct 2017 18:41:32 +0200 (CEST) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Oct 2017 09:41:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.43,391,1503385200"; d="scan'208";a="164145406" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga006.fm.intel.com with ESMTP; 17 Oct 2017 09:41:31 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Tue, 17 Oct 2017 17:41:02 +0100 Message-Id: <20171017164102.71159-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.13.6 Subject: [dpdk-dev] [PATCH] build: fix EAL path to drivers for static builds 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" For static builds, even though the drivers are installed in the lib folder that does not mean that that folder should be set as the EAL driver search path. If it is, EAL will try loading all shared libraries as drivers and fail to start. Instead, track the EAL driver path separately from the driver install path, allowing static builds to have an empty driver path by default. Fixes: d8b85d98b3f7 ("build: add initial infrastructure for meson & ninja builds") Signed-off-by: Bruce Richardson ---- NOTE: on apply will be merged into offending commit in next-build tree. --- config/meson.build | 3 +-- meson.build | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/meson.build b/config/meson.build index ce26a29f0..8e4a703c7 100644 --- a/config/meson.build +++ b/config/meson.build @@ -71,8 +71,7 @@ endif dpdk_conf.set('RTE_COMPILE_TIME_CPUFLAGS', ','.join(compile_time_cpuflags)) # set the install path for the drivers -dpdk_conf.set_quoted('RTE_EAL_PMD_PATH', join_paths( - get_option('prefix'), driver_install_path)) +dpdk_conf.set_quoted('RTE_EAL_PMD_PATH', eal_pmd_path) # set other values pulled from the build options dpdk_conf.set('RTE_MAX_LCORE', get_option('max_lcores')) diff --git a/meson.build b/meson.build index e3d40ac38..4af057615 100644 --- a/meson.build +++ b/meson.build @@ -47,8 +47,10 @@ dpdk_extra_ldflags = [] # for shared libs, put them in a driver folder if get_option('default_library') == 'static' driver_install_path = get_option('libdir') + eal_pmd_path = '' else driver_install_path = join_paths(get_option('libdir'), 'dpdk/drivers') + eal_pmd_path = join_paths(get_option('prefix'), driver_install_path) endif # configure the build, and make sure configs here and in config folder are