From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 106B04BE1 for ; Mon, 18 Sep 2017 13:27:23 +0200 (CEST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Sep 2017 04:27:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,412,1500966000"; d="scan'208";a="1220260935" Received: from bricha3-mobl3.ger.corp.intel.com ([10.237.221.24]) by fmsmga002.fm.intel.com with SMTP; 18 Sep 2017 04:27:20 -0700 Received: by (sSMTP sendmail emulation); Mon, 18 Sep 2017 12:27:19 +0100 Date: Mon, 18 Sep 2017 12:27:18 +0100 From: Bruce Richardson To: luca.boccassi@gmail.com Cc: dev@dpdk.org, Luca Boccassi Message-ID: <20170918112718.GB10264@bricha3-MOBL3.ger.corp.intel.com> References: <20170915173612.13636-1-luca.boccassi@gmail.com> <20170915173612.13636-3-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170915173612.13636-3-luca.boccassi@gmail.com> Organization: Intel Research and Development Ireland Ltd. User-Agent: Mutt/1.8.3 (2017-05-23) Subject: Re: [dpdk-dev] [PATCH 2/3] build: add optional arch-specific headers install path 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: , X-List-Received-Date: Mon, 18 Sep 2017 11:27:24 -0000 On Fri, Sep 15, 2017 at 06:36:11PM +0100, luca.boccassi@gmail.com wrote: > From: Luca Boccassi > > A subset of the dpdk headers are arch-dependent, but have common names > and thus cause a clash in a multiarch installation. > For example, rte_config.h is different for each target. > > Add a "include_subdir_arch" option to allow a user to specify a > subdirectory for arch independent headers to fix multiarch support. > > Signed-off-by: Luca Boccassi > --- > config/meson.build | 2 +- > lib/librte_eal/common/include/arch/x86/meson.build | 3 ++- > meson.build | 3 ++- > meson_options.txt | 1 + > 4 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/config/meson.build b/config/meson.build > index b57a7e64b..db68a08d4 100644 > --- a/config/meson.build > +++ b/config/meson.build > @@ -69,4 +69,4 @@ dpdk_conf.set('RTE_MAX_NUMA_NODES', get_option('max_numa_nodes')) > dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet')) > dpdk_conf.set('RTE_EAL_ALLOW_INV_SOCKET_ID', get_option('allow_invalid_socket_id')) > > -install_headers('rte_config.h') > +install_headers('rte_config.h', subdir: get_option('include_subdir_arch')) > diff --git a/lib/librte_eal/common/include/arch/x86/meson.build b/lib/librte_eal/common/include/arch/x86/meson.build > index 80b5980c1..5e9c02687 100644 > --- a/lib/librte_eal/common/include/arch/x86/meson.build > +++ b/lib/librte_eal/common/include/arch/x86/meson.build > @@ -45,4 +45,5 @@ install_headers( > 'rte_rtm.h', > 'rte_rwlock.h', > 'rte_spinlock.h', > - 'rte_vect.h') > + 'rte_vect.h', > + subdir: get_option('include_subdir_arch')) > diff --git a/meson.build b/meson.build > index f41fb4120..134158dae 100644 > --- a/meson.build > +++ b/meson.build > @@ -70,7 +70,7 @@ subdir('app') > build_cfg = 'rte_build_config.h' > configure_file(output: build_cfg, > configuration: dpdk_conf, > - install_dir: get_option('includedir')) > + install_dir: get_option('includedir') + '/' + get_option('include_subdir_arch')) Minor nit: use "join_paths()" function. Will fix on apply. Acked-by: Bruce Richardson