From 781243f8a77836150d25dba31be870df30cc153f Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Tue, 13 Nov 2018 14:04:22 +0000 Subject: [PATCH] Restore RTE_MACHINE DEB_BUILD_OPTIONS Pass it to meson, and set reasonable defaults Change-Id: Id2a8a89e9af2dc733c9f486a7bc219adc332f6fc Signed-off-by: Luca Boccassi --- debian/rules | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 31e04b7a..1322197d 100755 --- a/debian/rules +++ b/debian/rules @@ -12,6 +12,29 @@ ifeq (,$(findstring terse,$(DEB_BUILD_OPTIONS))) export DH_OPTIONS=-v endif +# People rebuilding this package can overwrite RTE_MACHINE +# via DEB_BUILD_OPTIONS if they like +ifneq (,$(filter rte_machine=%,$(DEB_BUILD_OPTIONS))) + RTE_MACHINE ?= $(patsubst rte_machine=%,%,$(filter rte_machine=%,$(DEB_BUILD_OPTIONS))) +endif + +# Use default for arm* where there is a defined list. +# x86 and power would just use "native", which is an invariant, so set +# power8 and corei7 to keep it stable. +ifneq (,$(filter $(DEB_HOST_ARCH), arm64)) +RTE_MACHINE ?= "default" +else +ifneq (,$(filter $(DEB_HOST_ARCH), armhf)) +RTE_MACHINE ?= "default" +else +ifneq (,$(filter $(DEB_HOST_ARCH), ppc64el)) +RTE_MACHINE ?= "power8" +else +RTE_MACHINE ?= "corei7" +endif +endif +endif + # now stable with parallel comilation, so support -j ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) PAR := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) @@ -96,7 +119,7 @@ override_dh_auto_configure: --includedir=include/dpdk \ -Dper_library_versions=false \ -Dinclude_subdir_arch=../$(DEB_HOST_MULTIARCH)/dpdk \ - -Dmachine=corei7 \ + -Dmachine=$(RTE_MACHINE) \ -Dkernel_dir=$(KSRC) \ -Denable_kmods=$(DPDK_CONFIG_BUILD_KMOD) -- 2.16.6