From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 1C115A0679 for ; Tue, 30 Apr 2019 19:02:25 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 103AF5A4A; Tue, 30 Apr 2019 19:02:25 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 1703D5B38 for ; Tue, 30 Apr 2019 19:02:24 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7CF1A3087932; Tue, 30 Apr 2019 17:02:23 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-211.ams2.redhat.com [10.36.117.211]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6FFCD17CF9; Tue, 30 Apr 2019 17:02:22 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Luca Boccassi , dpdk stable Date: Tue, 30 Apr 2019 18:01:19 +0100 Message-Id: <20190430170133.2331-24-ktraynor@redhat.com> In-Reply-To: <20190430170133.2331-1-ktraynor@redhat.com> References: <20190430170133.2331-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Tue, 30 Apr 2019 17:02:23 +0000 (UTC) Subject: [dpdk-stable] patch 'devtools: support older compilers with meson test' has been queued to LTS release 18.11.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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.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/07/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches can be viewed on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue.git Thanks. Kevin Traynor --- >From 4bef54f37c44582c69e2c20c5c97c6466c643d1c Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Wed, 10 Apr 2019 21:52:23 +0100 Subject: [PATCH] devtools: support older compilers with meson test [ upstream commit 2660c6f653c11fa37f3385b9f5777f1eff6489c8 ] Older versions of GCC, such as on Redhat/CentOS 7, don't support -march=nehalem, but need -march=corei7 instead. Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi --- devtools/test-meson-builds.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index 49bc7876c..79148ba28 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -45,5 +45,10 @@ done # test compilation with minimal x86 instruction set -build build-x86-default -Dmachine=nehalem $use_shared +default_machine='nehalem' +ok=$(cc -march=$default_machine -E - < /dev/null > /dev/null 2>&1 || echo false) +if [ "$ok" = "false" ] ; then + default_machine='corei7' +fi +build build-x86-default -Dmachine=$default_machine $use_shared # enable cross compilation if gcc cross-compiler is found -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-30 17:58:14.960935857 +0100 +++ 0024-devtools-support-older-compilers-with-meson-test.patch 2019-04-30 17:58:13.800139923 +0100 @@ -1 +1 @@ -From 2660c6f653c11fa37f3385b9f5777f1eff6489c8 Mon Sep 17 00:00:00 2001 +From 4bef54f37c44582c69e2c20c5c97c6466c643d1c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2660c6f653c11fa37f3385b9f5777f1eff6489c8 ] + @@ -9,2 +10,0 @@ -Cc: stable@dpdk.org - @@ -18 +18 @@ -index 9a67cfa64..c7bde2fb7 100755 +index 49bc7876c..79148ba28 100755 @@ -21 +21 @@ -@@ -63,5 +63,10 @@ done +@@ -45,5 +45,10 @@ done