From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id 181613195 for ; Sun, 6 May 2018 08:37:38 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id BBA66213A3; Sun, 6 May 2018 02:37:37 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sun, 06 May 2018 02:37:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=xGA9pXwRQ11NgsjMC zPReIQ/yhTDee18ipbIokz3rhM=; b=JVz9ZnwrUIr6TPLteNcqF5kYzL4vKP5DX SaGrTGsO2rqY86QNaToCFzSijIO08E3CLiYBN5oCxv7jtbjXyfs3tOYT+TCkZzG0 6LKfe2dyYfAwir7R6dn/e8Whxs+vjwkOSXFudpd5C9OCK2+VOnR3V9Ihu1Bw2jKH hhQDzcKYMJDO1xz+ti6t1eNdmtU7i79Fhb2vUJXpN2UObdfidMuvTd5yLhN3pKNj wAYqAPxsQPNA9OSCSRdPRAbIfuLZG8XL2t6nVeimRTipCxn9uWbYiSWmdWBvJdg2 6sCT2j6AGcN6IkfZrJt5RA3uKhCAmkdL0uFSH6lFKi/MPzWY8hBiQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=xGA9pXwRQ11NgsjMCzPReIQ/yhTDee18ipbIokz3rhM=; b=Z2siUbiu uiKQA1GbyAnrEe7LoGnJ+IyT3AmcV2Js/SWicNDGtuOK8RPKtpZCCiEJbRKen9dQ PPTpJXp5W+uhLb8g7ygErcNi2ldsRmdHBG/XNSrIBFoIbFv6oKwMjFtegmXoOJOe YiMa2bmaJGn4+uunvbarydoCKwzIsj44MjZ+vjx5g6DXAkt/SOKYg7XTPHrdzfZJ /FFxaTYyylbao/zUwsaLxIZYo/KP/HulfcayJvFka3CUoEAjGCM6MVQMFqgTANOl AzAw2yelkd/my6Ul9y+5JVvVuLKVrtqTK2520js22tiSKrG1545nv6uE8drV4ZmS j7M/5hK32O/m1g== X-ME-Sender: Received: from yuanhanliu-NB0.tencent.com (unknown [223.74.148.102]) by mail.messagingengine.com (Postfix) with ESMTPA id 69E4010256; Sun, 6 May 2018 02:37:35 -0400 (EDT) From: Yuanhan Liu To: David Hunt Cc: Anatoly Burakov , dpdk stable Date: Sun, 6 May 2018 14:36:21 +0800 Message-Id: <20180506063639.23196-8-yliu@fridaylinux.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180506063639.23196-1-yliu@fridaylinux.org> References: <20180506063639.23196-1-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'mk: fix make defconfig on FreeBSD' has been queued to LTS release 17.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 May 2018 06:37:38 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/09/18. So please shout if anyone has objections. Thanks. --yliu --- >>From 63fd5f7696943eba4ba10652b6bd2fe61e834692 Mon Sep 17 00:00:00 2001 From: David Hunt Date: Mon, 23 Apr 2018 14:09:02 +0100 Subject: [PATCH] mk: fix make defconfig on FreeBSD [ upstream commit 6ace79505d326d05aaa3c57facca7ca8e1675b11 ] On FreeBSD, make defconfig generates the config as "defconfig_x86_64-bsdapp-", which does not resolve to any known config file. On FreeBSD, we get amd64 out of "uname -m", which was not handled by the list of checks, but which now resolves to x86_64-native. Then we run '$CC --version', and use grep -o with the list of known compilers, and set to either gcc, icc or clang. Grep's '-o' option returns the matched word rather than the whole line, making the result easier to use. The remaining code in the patch then takes ${compiler}, the "uname -m" output and assembles them all together into a valid freebsd config name, i.e. "defconfig_x86_64-native-bsdapp-clang". Fixes: bce6c42c4ad5 ("mk: add sensible default target with defconfig") Signed-off-by: David Hunt Tested-by: Anatoly Burakov --- mk/rte.sdkconfig.mk | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk index 97363416a..59cf6b19b 100644 --- a/mk/rte.sdkconfig.mk +++ b/mk/rte.sdkconfig.mk @@ -64,7 +64,6 @@ notemplate: @echo "use T=template from the following list:" @$(MAKE) -rR showconfigs | sed 's,^, ,' - .PHONY: defconfig defconfig: @$(MAKE) config T=$(shell \ @@ -75,15 +74,25 @@ defconfig: print "arm-armv7a"} \ else if ($$0 == "ppc64") { \ print "ppc_64-power8"} \ + else if ($$0 == "amd64") { \ + print "x86_64-native"} \ else { \ - printf "%s-native", $$0} }')-$(shell \ + printf "%s-native", $$0} }' \ + )-$(shell \ uname | awk '{ \ if ($$0 == "Linux") { \ print "linuxapp"} \ else { \ - print "bsdapp"} }')-$(shell \ - ${CC} -v 2>&1 | \ - grep " version " | cut -d ' ' -f 1) + print "bsdapp"} }' \ + )-$(shell \ + ${CC} --version | grep -o 'cc\|gcc\|icc\|clang' | awk \ + '{ \ + if ($$1 == "cc") { \ + print "gcc" } \ + else { \ + print $$1 } \ + }' \ + ) .PHONY: config ifeq ($(RTE_CONFIG_TEMPLATE),) -- 2.11.0