From 850c962cc5a082ed112fd1be31e965044ac43c4f Mon Sep 17 00:00:00 2001 From: Christian Ehrhardt Date: Thu, 15 Nov 2018 10:52:43 +0100 Subject: [PATCH] d/rules: select baseline RTE_MACHINE=default Change-Id: Ic08f51b9d8aa8d76b34a1d9dd35972109253e7dd Signed-off-by: Christian Ehrhardt --- debian/rules | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/debian/rules b/debian/rules index 59c620cf..b88051ef 100755 --- a/debian/rules +++ b/debian/rules @@ -12,29 +12,15 @@ ifeq (,$(findstring terse,$(DEB_BUILD_OPTIONS))) export DH_OPTIONS=-v endif +# default to minimal base, without setting this it would build +# -march=native which is a non portable invariant +RTE_MACHINE ?= "default" # 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 ?= "armv7a" -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))) -- 2.16.6