File 7602-snmp-Treat-warnings-as-errors-by-default.p... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 7602-snmp-Treat-warnings-as-errors-by-default.patch of Package erlang (Revision 1e94e72e3f4fed1ca9cd5c2fd777ed02)

Currently displaying revision 1e94e72e3f4fed1ca9cd5c2fd777ed02 , Show latest

From 99ec0a91fddd9f0e720fe9ac30dbf3fb1588fc39 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 8 Dec 2020 10:07:47 +0100
Subject: [PATCH 2/2] [snmp] Treat warnings as errors by default

Add make constructs to treat 'warning as error' by default
in the snmp makefiles.
Also, improve 'warn_unused_vars' usage in said makefiles.

OTP-17063
---
 lib/snmp/src/agent/Makefile   | 17 ++++++++++++++---
 lib/snmp/src/app/Makefile     | 16 ++++++++++++++--
 lib/snmp/src/compile/Makefile | 16 ++++++++++++++--
 lib/snmp/src/manager/Makefile | 16 ++++++++++++++--
 lib/snmp/src/misc/Makefile    | 17 +++++++++++++++--
 lib/snmp/test/Makefile        | 16 ++++++++++++++++
 6 files changed, 87 insertions(+), 11 deletions(-)

diff --git a/lib/snmp/src/agent/Makefile b/lib/snmp/src/agent/Makefile
index 1bde1ca972..1b7999da20 100644
--- a/lib/snmp/src/agent/Makefile
+++ b/lib/snmp/src/agent/Makefile
@@ -76,14 +76,25 @@ ifeq ($(SNMP_EXT_VERBOSITY),true)
   SNMP_FLAGS += -Dsnmp_extended_verbosity
 endif
 
-
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
 ERL_COMPILE_FLAGS += -pa $(ERL_TOP)/lib/snmp/ebin
 
-ifeq ($(WARN_UNUSED_VARS),true)
-ERL_COMPILE_FLAGS += +warn_unused_vars
+ifeq ($(SNMP_WARNING_AS_ERROR),)
+  ERL_COMPILE_FLAGS += -Werror
+else
+  ifeq ($(SNMP_WARNING_AS_ERROR),true)
+    ERL_COMPILE_FLAGS += -Werror
+  endif
+endif
+
+ifeq ($(WARN_UNUSED_VARS),)
+  ERL_COMPILE_FLAGS += +warn_unused_vars
+else
+  ifeq ($(WARN_UNUSED_VARS),true)
+    ERL_COMPILE_FLAGS += +warn_unused_vars
+  endif
 endif
 
 ERL_COMPILE_FLAGS += -I../../include \
diff --git a/lib/snmp/src/app/Makefile b/lib/snmp/src/app/Makefile
index 6f2b8a4077..09ffc7d36a 100644
--- a/lib/snmp/src/app/Makefile
+++ b/lib/snmp/src/app/Makefile
@@ -82,8 +82,20 @@ endif
 
 ERL_COMPILE_FLAGS += -pa $(ERL_TOP)/lib/snmp/ebin
 
-ifeq ($(WARN_UNUSED_VARS),true)
-ERL_COMPILE_FLAGS += +warn_unused_vars
+ifeq ($(SNMP_WARNING_AS_ERROR),)
+  ERL_COMPILE_FLAGS += -Werror
+else
+  ifeq ($(SNMP_WARNING_AS_ERROR),true)
+    ERL_COMPILE_FLAGS += -Werror
+  endif
+endif
+
+ifeq ($(WARN_UNUSED_VARS),)
+  ERL_COMPILE_FLAGS += +warn_unused_vars
+else
+  ifeq ($(WARN_UNUSED_VARS),true)
+    ERL_COMPILE_FLAGS += +warn_unused_vars
+  endif
 endif
 
 ERL_COMPILE_FLAGS += -I../misc \
diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile
index d9678669a5..a8da839bfc 100644
--- a/lib/snmp/src/compile/Makefile
+++ b/lib/snmp/src/compile/Makefile
@@ -61,8 +61,20 @@ PARSER_TARGET = $(PARSER_MODULE).$(EMULATOR)
 # ----------------------------------------------------
 ERL_COMPILE_FLAGS += -pa $(ERL_TOP)/lib/snmp/ebin
 
-ifeq ($(WARN_UNUSED_VARS),true)
-ERL_COMPILE_FLAGS += +warn_unused_vars
+ifeq ($(SNMP_WARNING_AS_ERROR),)
+  ERL_COMPILE_FLAGS += -Werror
+else
+  ifeq ($(SNMP_WARNING_AS_ERROR),true)
+    ERL_COMPILE_FLAGS += -Werror
+  endif
+endif
+
+ifeq ($(WARN_UNUSED_VARS),)
+  ERL_COMPILE_FLAGS += +warn_unused_vars
+else
+  ifeq ($(WARN_UNUSED_VARS),true)
+    ERL_COMPILE_FLAGS += +warn_unused_vars
+  endif
 endif
 
 ERL_COMPILE_FLAGS += -I../../include \
diff --git a/lib/snmp/src/manager/Makefile b/lib/snmp/src/manager/Makefile
index 57ff08c160..ab8c36ec5e 100644
--- a/lib/snmp/src/manager/Makefile
+++ b/lib/snmp/src/manager/Makefile
@@ -71,8 +71,20 @@ endif
 
 ERL_COMPILE_FLAGS += -pa $(ERL_TOP)/lib/snmp/ebin
 
-ifeq ($(WARN_UNUSED_VARS),true)
-ERL_COMPILE_FLAGS += +warn_unused_vars
+ifeq ($(SNMP_WARNING_AS_ERROR),)
+  ERL_COMPILE_FLAGS += -Werror
+else
+  ifeq ($(SNMP_WARNING_AS_ERROR),true)
+    ERL_COMPILE_FLAGS += -Werror
+  endif
+endif
+
+ifeq ($(WARN_UNUSED_VARS),)
+  ERL_COMPILE_FLAGS += +warn_unused_vars
+else
+  ifeq ($(WARN_UNUSED_VARS),true)
+    ERL_COMPILE_FLAGS += +warn_unused_vars
+  endif
 endif
 
 ERL_COMPILE_FLAGS += -I../../include \
diff --git a/lib/snmp/src/misc/Makefile b/lib/snmp/src/misc/Makefile
index adc2c4858f..51318b5c66 100644
--- a/lib/snmp/src/misc/Makefile
+++ b/lib/snmp/src/misc/Makefile
@@ -71,8 +71,20 @@ endif
 
 ERL_COMPILE_FLAGS += -pa $(ERL_TOP)/lib/snmp/ebin
 
-ifeq ($(WARN_UNUSED_VARS),true)
-ERL_COMPILE_FLAGS += +warn_unused_vars
+ifeq ($(SNMP_WARNING_AS_ERROR),)
+  ERL_COMPILE_FLAGS += -Werror
+else
+  ifeq ($(SNMP_WARNING_AS_ERROR),true)
+    ERL_COMPILE_FLAGS += -Werror
+  endif
+endif
+
+ifeq ($(WARN_UNUSED_VARS),)
+  ERL_COMPILE_FLAGS += +warn_unused_vars
+else
+  ifeq ($(WARN_UNUSED_VARS),true)
+    ERL_COMPILE_FLAGS += +warn_unused_vars
+  endif
 endif
 
 ERL_COMPILE_FLAGS += -I../../include \
@@ -83,6 +95,7 @@ ERL_COMPILE_FLAGS += -I../../include \
                      -I$(ERL_TOP)/lib/stdlib \
                      $(SNMP_FLAGS)
 
+
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
diff --git a/lib/snmp/test/Makefile b/lib/snmp/test/Makefile
index 0e24506c5d..e9bd50f6d8 100644
--- a/lib/snmp/test/Makefile
+++ b/lib/snmp/test/Makefile
@@ -135,6 +135,22 @@ endif
 # ----------------------------------------------------
 EBIN = .
 
+ifeq ($(SNMP_WARNING_AS_ERROR),)
+  ERL_COMPILE_FLAGS += -Werror
+else
+  ifeq ($(SNMP_WARNING_AS_ERROR),true)
+    ERL_COMPILE_FLAGS += -Werror
+  endif
+endif
+
+ifeq ($(WARN_UNUSED_VARS),)
+  ERL_COMPILE_FLAGS += +warn_unused_vars
+else
+  ifeq ($(WARN_UNUSED_VARS),true)
+    ERL_COMPILE_FLAGS += +warn_unused_vars
+  endif
+endif
+
 ERL_COMPILE_FLAGS += -I../../snmp/src/app \
                      -I../../snmp/src/misc \
                      -I../../snmp/src/agent \
-- 
2.26.2

Places

File 7602-snmp-Treat-warnings-as-errors-by-default.patch of Package erlang (Revision 1e94e72e3f4fed1ca9cd5c2fd777ed02)

Places