patch 'build: fix warning about using -Wextra flag' has been queued to stable release 19.11.12

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.12

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/27/22. 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 are on a temporary branch at:
https://github.com/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/921ec4a84bd94d9fde03ce34a7cc3cbbcc94d085

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 921ec4a84bd94d9fde03ce34a7cc3cbbcc94d085 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Fri, 21 Jan 2022 16:12:30 +0000
Subject: [PATCH] build: fix warning about using -Wextra flag

[ upstream commit d832326ae9b1b67c2976da293a459b51297fcfa0 ]

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.

Fixes: 524a0d5d66b9 ("build: enable extra warnings with meson")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Luca Boccassi <bluca at debian.org>
---
 config/meson.build | 5 ++---
 meson.build        | 6 +++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/config/meson.build b/config/meson.build
index 25dec320ba..e87d1ba533 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -187,10 +187,9 @@ endif
 add_project_arguments('-include', 'rte_config.h', language: 'c')
 
 # 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 = [
-	# -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 428b84d22f..00ebbef115 100644
--- a/meson.build
+++ b/meson.build
@@ -7,7 +7,11 @@ project('DPDK', 'C',
 	version: run_command(find_program('cat', 'more'),
 		files('VERSION')).stdout().strip(),
 	license: 'BSD',
-	default_options: ['buildtype=release', 'default_library=static'],
+	default_options: [
+        'buildtype=release',
+        'default_library=static',
+        'warning_level=2',
+    ],
 	meson_version: '>= 0.47.1'
 )
 
-- 
2.35.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-25 16:58:45.436560656 +0100
+++ 0030-build-fix-warning-about-using-Wextra-flag.patch	2022-02-25 16:58:44.244990416 +0100
@@ -1 +1 @@
-From d832326ae9b1b67c2976da293a459b51297fcfa0 Mon Sep 17 00:00:00 2001
+From 921ec4a84bd94d9fde03ce34a7cc3cbbcc94d085 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d832326ae9b1b67c2976da293a459b51297fcfa0 ]
+
@@ -24 +26 @@
-index ee12318d4f..7134e80e8d 100644
+index 25dec320ba..e87d1ba533 100644
@@ -27 +29 @@
-@@ -247,10 +247,9 @@ endif
+@@ -187,10 +187,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 428b84d22f..00ebbef115 100644
@@ -45,10 +47,10 @@
-         version: run_command(find_program('cat', 'more'),
-             files('VERSION'), check: true).stdout().strip(),
-         license: 'BSD',
--        default_options: ['buildtype=release', 'default_library=static'],
-+        default_options: [
-+            'buildtype=release',
-+            'default_library=static',
-+            'warning_level=2',
-+        ],
-         meson_version: '>= 0.49.2'
+ 	version: run_command(find_program('cat', 'more'),
+ 		files('VERSION')).stdout().strip(),
+ 	license: 'BSD',
+-	default_options: ['buildtype=release', 'default_library=static'],
++	default_options: [
++        'buildtype=release',
++        'default_library=static',
++        'warning_level=2',
++    ],
+ 	meson_version: '>= 0.47.1'