From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Mon, 4 Nov 2024 19:01:35 +0000 (+0000)
Subject: build: alpha sort the compiler flags
X-Git-Tag: v34~126
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ba2e200cd4dc2aea9975f4765908281084cd37c;p=thirdparty%2Fkmod.git

build: alpha sort the compiler flags

Pipe the lot through sort so one can reasonably search, add, edit
without going crazy.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/226
---

diff --git a/configure.ac b/configure.ac
index 075e98bb..b37946c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -258,41 +258,41 @@ PKG_NOARCH_INSTALLDIR
 CC_CHECK_FLAGS_APPEND(with_cflags, [CFLAGS], [\
 		       -pipe \
 		       -DANOTHER_BRICK_IN_THE \
-		       -Wall \
+		       -fdata-sections \
+		       -fdiagnostics-show-option \
+		       -ffunction-sections \
+		       -fno-common \
+		       -fvisibility=hidden \
 		       -W \
+		       -Wall \
+		       -Wchar-subscripts \
+		       -Wdeclaration-after-statement \
+		       -Wendif-labels \
 		       -Wextra \
-		       -Wvla \
-		       -Wundef \
+		       -Wfloat-equal \
 		       -Wformat=2 \
-		       -Wlogical-op \
-		       -Wsign-compare \
+		       -Wformat-nonliteral \
 		       -Wformat-security \
+		       -Winit-self \
+		       -Wlogical-op \
+		       -Wmissing-declarations \
 		       -Wmissing-include-dirs \
-		       -Wformat-nonliteral \
+		       -Wmissing-noreturn \
+		       -Wmissing-prototypes \
+		       -Wnested-externs \
+		       -Wno-unused-parameter \
 		       -Wold-style-definition \
 		       -Wpointer-arith \
-		       -Winit-self \
-		       -Wdeclaration-after-statement \
-		       -Wfloat-equal \
-		       -Wmissing-prototypes \
-		       -Wstrict-prototypes \
 		       -Wredundant-decls \
-		       -Wmissing-declarations \
-		       -Wmissing-noreturn \
 		       -Wshadow \
-		       -Wendif-labels \
+		       -Wsign-compare \
 		       -Wstrict-aliasing=3 \
-		       -Wwrite-strings \
-		       -Wno-unused-parameter \
-		       -Wnested-externs \
-		       -Wchar-subscripts \
+		       -Wstrict-prototypes \
 		       -Wtype-limits \
+		       -Wundef \
 		       -Wuninitialized \
-		       -fno-common \
-		       -fdiagnostics-show-option \
-		       -fvisibility=hidden \
-		       -ffunction-sections \
-		       -fdata-sections])
+		       -Wvla \
+		       -Wwrite-strings])
 AC_SUBST([OUR_CFLAGS], "$with_cflags $with_coverage_cflags")
 
 
diff --git a/meson.build b/meson.build
index 1bd686ba..b4789df4 100644
--- a/meson.build
+++ b/meson.build
@@ -112,37 +112,37 @@ endif
 
 add_project_arguments(
   cc.get_supported_arguments([
-    '-Wvla',
-    '-Wundef',
+    '-fdata-sections',
+    '-fdiagnostics-show-option',
+    '-ffunction-sections',
+    '-fno-common',
+    '-Wchar-subscripts',
+    '-Wdeclaration-after-statement',
+    '-Wendif-labels',
+    '-Wfloat-equal',
     '-Wformat=2',
-    '-Wlogical-op',
-    '-Wsign-compare',
+    '-Wformat-nonliteral',
     '-Wformat-security',
+    '-Winit-self',
+    '-Wlogical-op',
+    '-Wmissing-declarations',
     '-Wmissing-include-dirs',
-    '-Wformat-nonliteral',
+    '-Wmissing-noreturn',
+    '-Wmissing-prototypes',
+    '-Wnested-externs',
+    '-Wno-unused-parameter',
     '-Wold-style-definition',
     '-Wpointer-arith',
-    '-Winit-self',
-    '-Wdeclaration-after-statement',
-    '-Wfloat-equal',
-    '-Wmissing-prototypes',
-    '-Wstrict-prototypes',
     '-Wredundant-decls',
-    '-Wmissing-declarations',
-    '-Wmissing-noreturn',
     '-Wshadow',
-    '-Wendif-labels',
+    '-Wsign-compare',
     '-Wstrict-aliasing=3',
-    '-Wwrite-strings',
-    '-Wno-unused-parameter',
-    '-Wnested-externs',
-    '-Wchar-subscripts',
+    '-Wstrict-prototypes',
     '-Wtype-limits',
+    '-Wundef',
     '-Wuninitialized',
-    '-fno-common',
-    '-fdiagnostics-show-option',
-    '-ffunction-sections',
-    '-fdata-sections',
+    '-Wvla',
+    '-Wwrite-strings',
   ]),
   language : 'c'
 )