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 76783A0032 for ; Fri, 18 Feb 2022 13:43:07 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7169F41142; Fri, 18 Feb 2022 13:43:07 +0100 (CET) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mails.dpdk.org (Postfix) with ESMTP id 49A1641142 for ; Fri, 18 Feb 2022 13:43:06 +0100 (CET) Received: by mail-wr1-f48.google.com with SMTP id m27so2589328wrb.4 for ; Fri, 18 Feb 2022 04:43:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lSK9SKi7hAAT60PNOrG1hy+b7LfEHY7TU3v/Ls/cpYI=; b=DnFNJwhC0u5frv1mHVync/obyvJ7sgGC1nK8XKJTLfpPfS3yfF5CPn+pDaTrN/l0TT jsTgOKbXPs8bJPbCm99CvTG1ps2znFWB6HruK+HdKPIYOOvghyo1bgaYStgbQA+Sw3LV 7RVSzya7tP56H6T0ChIX8H287/nfHKXLq/DY9ykUNo2UvrSvqPZB41oLPBfbNjfmX6B4 rhuUkPhzTzh+VqWPOjpT1sgGXgeXqezorT2RCvBGgaiPQAI5dRWYEWLo+tM+QjvD5mUP mrN3i5ixphLtPR0I3CcuVlH578vlhpFHH02ieKBVupojO7jzxV/PmB2ki+2DXFWoMG5V HzxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lSK9SKi7hAAT60PNOrG1hy+b7LfEHY7TU3v/Ls/cpYI=; b=H5m0j00ayXn4oScZjpwdSM+/Ph6nCRS9wWppEGgk5Gm0XZo0zE2HdzG/vPUYz6CcvB Rr3vcmTpQBh26cTETQxEWYaiQOG8EH70BMxA3uo8SIu2eR7mdFEFtBmwtTOj3kcN4iEo Qci4+5T8UrD28KiDU3hjLRHaynRSsxKWokA+R9m9z/zFWRylL09DFlTUkkUy9YsWdnv/ RBni3TsGIbHrm+vc0icjWCQjiSTnFS+cTGjxf/kYSYwTGu6mTYR5jEmB5SxAAf/CPZjT /pKdfZPDE0oGRiQilSfuiAdyWC2EHaCexQzxToC3sSGcmmyVQETbbcH2x05Ourdz0aGY KVYQ== X-Gm-Message-State: AOAM532+FzTHy17seLEaJezhWjdy6o1WCaXEYGDpjPQBC/J6WAD77U7c wQFScgbUeXAJ2UuiZzWrnwOx9j6ZLC96dtJY X-Google-Smtp-Source: ABdhPJxtK0mwlRG8Ej8NhNuBcZ6Byy/fBPFog+T6U665I7p9IR2iuP3Ob5FlzA1FmzSlC51QllcjYQ== X-Received: by 2002:a5d:64e5:0:b0:1e7:6860:606c with SMTP id g5-20020a5d64e5000000b001e76860606cmr6011785wri.467.1645188186074; Fri, 18 Feb 2022 04:43:06 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id g22sm4078658wmh.12.2022.02.18.04.43.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:43:05 -0800 (PST) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Luca Boccassi , dpdk stable Subject: patch 'build: fix warning about using -Wextra flag' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:38:38 +0000 Message-Id: <20220218123931.1749595-69-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 20.11.5 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. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/3215df7480e04af0ce177c5320d6c580bedec99a Thanks. Luca Boccassi --- >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 [ 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 Acked-by: Luca Boccassi --- 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 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') # 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 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=release', 'default_library=static'], + default_options: [ + 'buildtype=release', + 'default_library=static', + 'warning_level=2', + ], meson_version: '>= 0.47.1' ) -- 2.30.2 --- 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=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'), 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.47.1'