From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1F4DEA0032 for ; Fri, 18 Feb 2022 14:13:21 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E4D5940141; Fri, 18 Feb 2022 14:13:20 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id BAB6D40141 for ; Fri, 18 Feb 2022 14:13:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1645189999; x=1676725999; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=HlPoTWwOy584hBKdtr4CiHFbYAHCpBSZ02H8KdGAG6k=; b=jeEZGz6mvQOpGSbny2HIu/WSwyZrqmxKjs+ax/BuWCXHk5Z3RPOPYX4w Y4y1+qqNr29vjO1qi0boU97nDjSgx7Wvt/qsOST9/9cXrwmyBNS0titli 3Xa3YuvX55jOLrnNvD6A86/jYGxQuUypTQKulwd7pc1JINs4ETME20dEH unCe+MRaC3iVDA8GGql9XjpbR/PUF1AQ2ZB3Pxwnm0k5a1DWpMSceAlrn UaHcn6BudFaz3ucMxvm7pAYt0fWmz0vbV1SRZYVAuT+gPxL7qfFd83Its dwRJOrh8+bGTuUFbFipCXdrITUXqAChMRIpthmA3BwYI4I6wlvSygADpe A==; X-IronPort-AV: E=McAfee;i="6200,9189,10261"; a="231105053" X-IronPort-AV: E=Sophos;i="5.88,378,1635231600"; d="scan'208";a="231105053" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2022 05:13:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,378,1635231600"; d="scan'208";a="530919871" Received: from irsmsx601.ger.corp.intel.com ([163.33.146.7]) by orsmga007.jf.intel.com with ESMTP; 18 Feb 2022 05:13:17 -0800 Received: from irsmsx601.ger.corp.intel.com (163.33.146.7) by irsmsx601.ger.corp.intel.com (163.33.146.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Fri, 18 Feb 2022 13:13:17 +0000 Received: from irsmsx601.ger.corp.intel.com ([163.33.146.7]) by irsmsx601.ger.corp.intel.com ([163.33.146.7]) with mapi id 15.01.2308.020; Fri, 18 Feb 2022 13:13:17 +0000 From: "Richardson, Bruce" To: "luca.boccassi@gmail.com" CC: Luca Boccassi , dpdk stable Subject: RE: patch 'build: fix warning about using -Wextra flag' has been queued to stable release 20.11.5 Thread-Topic: patch 'build: fix warning about using -Wextra flag' has been queued to stable release 20.11.5 Thread-Index: AQHYJMUVyfkDvf5qJkOcubwkcGYI0qyZSKuA Date: Fri, 18 Feb 2022 13:13:16 +0000 Message-ID: References: <20220218123931.1749595-1-luca.boccassi@gmail.com> <20220218123931.1749595-69-luca.boccassi@gmail.com> In-Reply-To: <20220218123931.1749595-69-luca.boccassi@gmail.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.6.200.16 dlp-product: dlpe-windows dlp-reaction: no-action x-originating-ip: [163.33.253.164] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 I'm a little conflicted about this patch being backported. While it's proba= bly safe enough, since it only affects warnings, it's probably unnecessary = to backport. I'll defer to your judgement, Luca, as LTS maintainer. > -----Original Message----- > From: luca.boccassi@gmail.com > Sent: Friday, February 18, 2022 12:39 PM > To: Richardson, Bruce > Cc: Luca Boccassi ; dpdk stable > Subject: patch 'build: fix warning about using -Wextra flag' has been > queued to stable release 20.11.5 >=20 > Hi, >=20 > FYI, your patch has been queued to stable release 20.11.5 >=20 > Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. > It will be pushed if I get no objections before 02/20/22. So please > shout if anyone has objections. >=20 > 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. >=20 > Queued patches are on a temporary branch at: > https://github.com/bluca/dpdk-stable >=20 > This queued commit can be viewed at: > https://github.com/bluca/dpdk- > stable/commit/3215df7480e04af0ce177c5320d6c580bedec99a >=20 > Thanks. >=20 > Luca Boccassi >=20 > --- > From 3215df7480e04af0ce177c5320d6c580bedec99a Mon Sep 17 00:00:00 2001 > From: Bruce Richardson > Date: Fri, 21 Jan 2022 16:12:30 +0000 > Subject: [PATCH] build: fix warning about using -Wextra flag >=20 > [ upstream commit d832326ae9b1b67c2976da293a459b51297fcfa0 ] >=20 > Each build, meson would issue a warning reporting that the > "warning_level" setting should be used in place of adding -Wextra > directly to our build commands. Testing with meson 0.61 shows that the > only difference for gcc and clang builds between warning levels 1 and > 2 is the addition of -Wextra, so we can remove the warning by deleting > our explicit set of Wextra and changing the build defaults to > warning_level 2. >=20 > Fixes: 524a0d5d66b9 ("build: enable extra warnings with meson") >=20 > Signed-off-by: Bruce Richardson > Acked-by: Luca Boccassi > --- > config/meson.build | 5 ++--- > meson.build | 6 +++++- > 2 files changed, 7 insertions(+), 4 deletions(-) >=20 > diff --git a/config/meson.build b/config/meson.build > index 7275946e66..bd50f189e0 100644 > --- a/config/meson.build > +++ b/config/meson.build > @@ -194,10 +194,9 @@ endif > add_project_arguments('-include', 'rte_config.h', language: 'c') >=20 > # enable extra warnings and disable any unwanted warnings > +# -Wall is added by default at warning level 1, and -Wextra > +# at warning level 2 (DPDK default) > warning_flags =3D [ > - # -Wall is added by meson by default, so add -Wextra only > - '-Wextra', > - > # additional warnings in alphabetical order > '-Wcast-qual', > '-Wdeprecated', > diff --git a/meson.build b/meson.build > index 4463c40018..8eeb0ff8d8 100644 > --- a/meson.build > +++ b/meson.build > @@ -7,7 +7,11 @@ project('DPDK', 'C', > version: run_command(find_program('cat', 'more'), > files('VERSION'), check: true).stdout().strip(), > license: 'BSD', > - default_options: ['buildtype=3Drelease', 'default_library=3Dstatic'], > + default_options: [ > + 'buildtype=3Drelease', > + 'default_library=3Dstatic', > + 'warning_level=3D2', > + ], > meson_version: '>=3D 0.47.1' > ) >=20 > -- > 2.30.2 >=20 > --- > Diff of the applied patch vs upstream commit (please double-check if > non-empty: > --- > --- - 2022-02-18 12:37:40.641036173 +0000 > +++ 0069-build-fix-warning-about-using-Wextra-flag.patch 2022-02-18 > 12:37:37.746793171 +0000 > @@ -1 +1 @@ > -From d832326ae9b1b67c2976da293a459b51297fcfa0 Mon Sep 17 00:00:00 2001 > +From 3215df7480e04af0ce177c5320d6c580bedec99a Mon Sep 17 00:00:00 2001 > @@ -5,0 +6,2 @@ > +[ upstream commit d832326ae9b1b67c2976da293a459b51297fcfa0 ] > + > @@ -24 +26 @@ > -index ee12318d4f..7134e80e8d 100644 > +index 7275946e66..bd50f189e0 100644 > @@ -27 +29 @@ > -@@ -247,10 +247,9 @@ endif > +@@ -194,10 +194,9 @@ endif > @@ -34,2 +36,2 @@ > -- # -Wall is added by meson by default, so add -Wextra only > -- '-Wextra', > +- # -Wall is added by meson by default, so add -Wextra only > +- '-Wextra', > @@ -37,3 +39,3 @@ > - # additional warnings in alphabetical order > - '-Wcast-qual', > - '-Wdeprecated', > + # additional warnings in alphabetical order > + '-Wcast-qual', > + '-Wdeprecated', > @@ -41 +43 @@ > -index 1223b79d74..3d97e96f38 100644 > +index 4463c40018..8eeb0ff8d8 100644 > @@ -45,10 +47,10 @@ > - version: run_command(find_program('cat', 'more'), > - files('VERSION'), check: true).stdout().strip(), > - license: 'BSD', > -- default_options: ['buildtype=3Drelease', > 'default_library=3Dstatic'], > -+ default_options: [ > -+ 'buildtype=3Drelease', > -+ 'default_library=3Dstatic', > -+ 'warning_level=3D2', > -+ ], > - meson_version: '>=3D 0.49.2' > + version: run_command(find_program('cat', 'more'), > + files('VERSION'), check: true).stdout().strip(), > + license: 'BSD', > +- default_options: ['buildtype=3Drelease', 'default_library=3Dstatic'], > ++ default_options: [ > ++ 'buildtype=3Drelease', > ++ 'default_library=3Dstatic', > ++ 'warning_level=3D2', > ++ ], > + meson_version: '>=3D 0.47.1'