From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by dpdk.org (Postfix) with ESMTP id 0FF101DBB for ; Mon, 30 Apr 2018 16:44:36 +0200 (CEST) Received: by mail-wm0-f67.google.com with SMTP id o78so14702064wmg.0 for ; Mon, 30 Apr 2018 07:44:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WJP2krZtz0PdXEAfYIHLI3tI8LgEzSHgnuUvyewzAt8=; b=WX8Yjgejx+FgRkaqoAy0gv+AwXVVKgiNfJ6t+vnkGeMVYF/1OkGQ19t3Zp44KyOPc4 M5jxrGF62JdCEsuWZQUI/eEyu0nQssv1ZK0fmhOQ+pOFsIEUHg31v9lLwaLUk54B0bro jmqSA9DnfxZfW6Q4tDGHrX82z7GmjHBLJAZeavJEH5iP2++SVO9tStCN1oSnviS8rlf2 wYKJmm+pbAPzmi5t+TtcZWOYOJmpuugD1rHSxmpVEfFJBwUdEShcmzPd5gBEL2CSbU5N s9ndFxrZtUeGkpb9T0KxM0JOJ6GLaIEIiHrRh2ZLWu+lk6+6veTdF8KReIUBqAnj5zZM wgaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WJP2krZtz0PdXEAfYIHLI3tI8LgEzSHgnuUvyewzAt8=; b=qPdBPCOHO4LdTOQPl1o/+PbKIlmIcKrdfxGSzj4lrpWlQCZoKhrdLwrDXIemzxYolx TaXZnkSA3fF17U/yFtc1p4JgXuHs257n1Q0Q7B1ZLTQiUUYxT5GH3+iVRIHyDMu6JUVF waTj08wh7V41Q+aMuBlFdoUCGDCWmmz591GjK5VRTS1HKLJlWx/CsV8cJRM2hb8GFLBk vRKGXDojUkTEAQymnAeqaILGaY9cj23JCh1fPXNMFAXlnFwesSGzttM0VvGVzBaEKGiI +Y8hUYu9JcNpUQpKY+Yyw+RsqZLTIEPH9rRqYEgRkulQ+UeHFjVjpy6L7cIUKrE1C4E9 qfuQ== X-Gm-Message-State: ALQs6tDTxbKn/CezPG2vrl5iKJUIWw21YJSCc4kUrc0+VJnyHRpB9DWA kiAd3caxfOVJon0aQY/ofCulV0QbXWs= X-Google-Smtp-Source: AB8JxZqtb5qnXvcopj+kBvV2bcl9gzEX1RSXy8Gj5fFJQ1byNFhn9y6g3Ocmgt3unGS4ZWJz94JSKA== X-Received: by 10.28.48.206 with SMTP id w197mr6811988wmw.22.1525099475725; Mon, 30 Apr 2018 07:44:35 -0700 (PDT) Received: from localhost ([2a00:23c5:be9a:5200:ce4c:82c0:d567:ecbb]) by smtp.gmail.com with ESMTPSA id 42-v6sm13901555wrx.24.2018.04.30.07.44.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Apr 2018 07:44:34 -0700 (PDT) From: luca.boccassi@gmail.com To: David Hunt Cc: Anatoly Burakov , dpdk stable Date: Mon, 30 Apr 2018 15:41:37 +0100 Message-Id: <20180430144223.18657-82-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180430144223.18657-1-luca.boccassi@gmail.com> References: <20180430140606.4615-80-luca.boccassi@gmail.com> <20180430144223.18657-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'mk: fix make defconfig on FreeBSD' has been queued to stable release 18.02.2 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: Mon, 30 Apr 2018 14:44:36 -0000 Hi, FYI, your patch has been queued to stable release 18.02.2 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/02/18. So please shout if anyone has objections. Thanks. Luca Boccassi --- >>From 242933f016b3f3fd7603775368fa64860e11fd59 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 0664725ee..d90d62cc6 100644 --- a/mk/rte.sdkconfig.mk +++ b/mk/rte.sdkconfig.mk @@ -36,7 +36,6 @@ notemplate: @echo "use T=template from the following list:" @$(MAKE) -rR showconfigs | sed 's,^, ,' - .PHONY: defconfig defconfig: @$(MAKE) config T=$(shell \ @@ -47,15 +46,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.14.2