summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2009-02-10 15:33:54 +0100
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2009-02-10 15:33:54 +0100
commit580d2970f4c1429a71a2ea4f8fda419b897f092d (patch)
tree006f5228bac422ae9bfde86b9bf43e9af20aaa01
parent3e5d3deae47677521c51486638288e3d05bda645 (diff)
Disable extra warning flags
In order to disable the extra warning flags, NO_EXTRA_WARN_FLAGS variable added to userspace Makefile.
-rw-r--r--ChangeLog4
-rw-r--r--Makefile7
-rw-r--r--README8
3 files changed, 18 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index adb2eb9..c68417e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2.4.8
+ - In order to disable the extra warning flags, NO_EXTRA_WARN_FLAGS
+ variable added to userspace Makefile
+
2.4.5
- Some compiler warning options are too aggressive and
therefore disabled.
diff --git a/Makefile b/Makefile
index 326aef8..35d9604 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,8 @@ IPSET_LIB_DIR:=$(LIBDIR)/ipset
RELEASE_DIR:=/tmp
COPT_FLAGS:=-O2
-WARN_FLAGS:=-Wall \
+WARN_FLAGS:=-Wall
+EXTRA_WARN_FLAGS:=\
-Wextra \
-Waggregate-return \
-Wbad-function-cast \
@@ -58,6 +59,10 @@ WARN_FLAGS:=-Wall \
-Wno-missing-field-initializers \
-Werror
+ifndef NO_EXTRA_WARN_FLAGS
+WARN_FLAGS+=$(EXTRA_WARN_FLAGS)
+endif
+
CFLAGS:=$(COPT_FLAGS) $(WARN_FLAGS) -Ikernel/include -I. # -g -DIPSET_DEBUG #-pg
SH_CFLAGS:=$(CFLAGS) -fPIC
SETTYPES:=ipmap portmap macipmap
diff --git a/README b/README
index a48782d..4833b90 100644
--- a/README
+++ b/README
@@ -14,6 +14,14 @@ This is the ipset source tree. Follow these steps to install ipset:
IP_NF_SET_MAX=<<your setsize number>> \
IP_NF_SET_HASHSIZE=<<your hashsize number>>
+ If your compiler does not support all of the extra warning
+ flags, you can disable those too:
+
+ # make KERNEL_DIR=<<where-you-built-your-kernel>> \
+ IP_NF_SET_MAX=<<your setsize number>> \
+ IP_NF_SET_HASHSIZE=<<your hashsize number>> \
+ NO_EXTRA_WARN_FLAGS=yes
+
2. Install the binary and the modules
# make KERNEL_DIR=<<where-you-built-your-kernel>> install