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 D767BA034C for ; Fri, 25 Feb 2022 18:17:16 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D20154113D; Fri, 25 Feb 2022 18:17:16 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 5F0294114D for ; Fri, 25 Feb 2022 18:17:15 +0100 (CET) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 455023FCAC for ; Fri, 25 Feb 2022 17:17:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1645809435; bh=cx4siEvzj7U8tFmchxTsSrf9nlN+KpqQsOIZ9jDl8XQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pGrF+/pOLz+kyN2i26e5edqGKQABvWz6DzaTWHLYXoYLkqxCr16xANIK4A9OvDCYs y/TbDm5ZpcvESVxc1wEUcUiUiy9DSKqf/T6NWntNJb8eas4fhwdDicO3QJ9tNdozMN rKwfE+w+HIIF6xT8qTx33HvtS1fznp8qCX9W82k8gINVMigaVYyjIUX8o2YGCLACzs 2bU2CEsAoxFcByQJirwtFe/vN2UsEBKZRshztabPu1MIroTozrsGxJugETUrxsztKT mtBKn5jmn0VyTFSQbutSMRUE7svXzNZiWfenyOD57X5rSBbUOkap9LNYpW+bwT4Ruo Pyf4W1tIWk7Rg== Received: by mail-wr1-f70.google.com with SMTP id z16-20020adff1d0000000b001ef7dc78b23so152945wro.12 for ; Fri, 25 Feb 2022 09:17:15 -0800 (PST) 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=cx4siEvzj7U8tFmchxTsSrf9nlN+KpqQsOIZ9jDl8XQ=; b=FkNXkv0vgrNZ+tjVUHnxK8CZ4E0whziZz9p2FQVazy7Qn7xw7U/6OyCBEtu6CDuXhM 1cHwsEo9v0ggXDCbh9ttSzAZ/xcpv9JsgpQ8+raMHFO8YwUJXdBor7c53O0y3IUO7G6m CHQozMfafu7dlVWCPmqfO+nJOkKo2rueHBCKYPbW/nhiQhVWUrMkXhaATJQKbJpHMBIs lvnQb2PmK8eWZpEUNrTQFi70GuMsa5NPZkpnFJOL4ToAh5Uxb6TE/PLk96/vaLw5dZ/P M63r1a53zu/jTrAuigDQJbT+irmd+d17OLWXOOy1HmEL97F3yPsCNcsdApwQ49zS1o24 aazg== X-Gm-Message-State: AOAM533MHU2NYxfvp0FL1fMg6JiirXnmcCj4XYYW5YXXme51/VuniASG vJ9w4Sxvg5KkJIZgIvOdNp9xsWGwAQ51txFMlvjTd4BekPyARhXHdp9NeaBlqWiT9oHB8BY7gMk FTEwNZYTFNyh7L8dIM2YWJRSh X-Received: by 2002:a5d:59a5:0:b0:1e9:ee82:86c5 with SMTP id p5-20020a5d59a5000000b001e9ee8286c5mr6825058wrr.14.1645809434901; Fri, 25 Feb 2022 09:17:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJzvhD229IToaom8HbzQSFYNQIwCMarphka16G1e3nrY92zzYY63ebgTcd9OsyEIxpPWEh47qw== X-Received: by 2002:a5d:59a5:0:b0:1e9:ee82:86c5 with SMTP id p5-20020a5d59a5000000b001e9ee8286c5mr6825045wrr.14.1645809434682; Fri, 25 Feb 2022 09:17:14 -0800 (PST) Received: from Keschdeichel.fritz.box (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id t8-20020a5d6908000000b001e3169cc6afsm2823779wru.94.2022.02.25.09.17.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:17:14 -0800 (PST) From: christian.ehrhardt@canonical.com To: Bruce Richardson Cc: Luca Boccassi , dpdk stable Subject: patch 'build: fix warning about using -Wextra flag' has been queued to stable release 19.11.12 Date: Fri, 25 Feb 2022 18:15:23 +0100 Message-Id: <20220225171550.3499040-30-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> References: <20220225171550.3499040-1-christian.ehrhardt@canonical.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 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 --- >From 921ec4a84bd94d9fde03ce34a7cc3cbbcc94d085 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 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'