-Wextra is supported by both our gcc.
This commit is contained in:
parent
04d17f1b94
commit
94f1916b74
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-makefile,v 1.7 2012/07/10 15:22:44 jasper Exp $
|
||||
$OpenBSD: patch-makefile,v 1.8 2013/11/02 11:13:19 ajacoutot Exp $
|
||||
--- makefile.orig Wed Feb 16 16:03:25 2011
|
||||
+++ makefile Sat Jul 7 15:02:14 2012
|
||||
+++ makefile Sat Nov 2 11:48:11 2013
|
||||
@@ -1,14 +1,13 @@
|
||||
LIBNAME = lpeg
|
||||
-LUADIR = /usr/include/lua5.1/
|
||||
@ -9,8 +9,7 @@ $OpenBSD: patch-makefile,v 1.7 2012/07/10 15:22:44 jasper Exp $
|
||||
-COPT = -O2 -DNDEBUG
|
||||
+COPT = -O2 -DNDEBUG -fPIC -shared
|
||||
|
||||
-CWARNS = -Wall -Wextra -pedantic \
|
||||
+CWARNS = -Wall -pedantic \
|
||||
CWARNS = -Wall -Wextra -pedantic \
|
||||
-Waggregate-return \
|
||||
-Wbad-function-cast \
|
||||
-Wcast-align \
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-build_scons-tools_scons_configure_py,v 1.1.1.1 2007/10/01 21:37:28 simon Exp $
|
||||
$OpenBSD: patch-build_scons-tools_scons_configure_py,v 1.2 2013/11/02 11:13:19 ajacoutot Exp $
|
||||
--- build/scons-tools/scons_configure.py.orig Sat Sep 8 00:53:34 2007
|
||||
+++ build/scons-tools/scons_configure.py Sun Sep 23 21:19:12 2007
|
||||
+++ build/scons-tools/scons_configure.py Sat Nov 2 11:59:45 2013
|
||||
@@ -172,6 +172,8 @@ def do_configure(config_h_file, conf, env):
|
||||
print "Your compiler does not support __attribute__((format(printf, 2, 3))) which is neccessary for widelands. Please get a decent compiler."
|
||||
env.Exit(1)
|
||||
@ -10,12 +10,7 @@ $OpenBSD: patch-build_scons-tools_scons_configure_py,v 1.1.1.1 2007/10/01 21:37:
|
||||
setlocalefound=0
|
||||
if (conf.CheckFunc('setlocale') or conf.CheckLibWithHeader('', 'locale.h', 'C', 'setlocale("LC_ALL", "C");', autoadd=0)):
|
||||
setlocalefound=1
|
||||
@@ -271,23 +273,23 @@ def do_configure(config_h_file, conf, env):
|
||||
conf.CheckCompilerFlag('-Wcast-qual', env)
|
||||
conf.CheckCompilerFlag('-Wconversion', env)
|
||||
conf.CheckCompilerFlag('-Wdisabled-optimization', env)
|
||||
- conf.CheckCompilerFlag('-Wextra', env)
|
||||
+ #conf.CheckCompilerFlag('-Wextra', env)
|
||||
@@ -275,19 +277,19 @@ def do_configure(config_h_file, conf, env):
|
||||
#conf.CheckCompilerFlag('-Wfloat-equal', env)
|
||||
#conf.CheckCompilerFlag('-Wformat=2', env)
|
||||
conf.CheckCompilerFlag('-Winline', env)
|
||||
|
@ -1,28 +1,28 @@
|
||||
$OpenBSD: patch-makefile,v 1.1.1.1 2009/10/15 14:39:10 phessler Exp $
|
||||
--- makefile.orig Tue Jun 2 14:39:19 2009
|
||||
+++ makefile Tue Jun 2 14:41:00 2009
|
||||
$OpenBSD: patch-makefile,v 1.2 2013/11/02 11:13:19 ajacoutot Exp $
|
||||
--- makefile.orig Thu Jun 8 22:08:40 2006
|
||||
+++ makefile Sat Nov 2 12:00:57 2013
|
||||
@@ -13,19 +13,19 @@ libalpng.a: $(OBJECTS)
|
||||
ar crs libalpng.a $?
|
||||
|
||||
objects/%.o: %.c
|
||||
- gcc $(CFLAGS) -O3 -Wall -Wextra -ansi -pedantic -Isrc -c $< -o $@
|
||||
+ ${CC} $(CFLAGS) -O3 -Wall -ansi -pedantic -Isrc -c $< -o $@
|
||||
+ ${CC} $(CFLAGS) -O3 -Wall -Wextra -ansi -pedantic -Isrc -c $< -o $@
|
||||
|
||||
objects/%.o: src/%.c
|
||||
- gcc $(CFLAGS) -O3 -Wall -Wextra -ansi -pedantic -Isrc -c $< -o $@
|
||||
+ ${CC} $(CFLAGS) -O3 -Wall -ansi -pedantic -Isrc -c $< -o $@
|
||||
+ ${CC} $(CFLAGS) -O3 -Wall -Wextra -ansi -pedantic -Isrc -c $< -o $@
|
||||
|
||||
objects/%.o: src/inflate/%.c
|
||||
- gcc $(CFLAGS) -O3 -Wall -Wextra -ansi -pedantic -Isrc -c $< -o $@
|
||||
+ ${CC} $(CFLAGS) -O3 -Wall -ansi -pedantic -Isrc -c $< -o $@
|
||||
+ ${CC} $(CFLAGS) -O3 -Wall -Wextra -ansi -pedantic -Isrc -c $< -o $@
|
||||
|
||||
objects/%.o: src/quantization/%.c
|
||||
- gcc $(CFLAGS) -O3 -Wall -Wextra -ansi -pedantic -Isrc -c $< -o $@
|
||||
+ ${CC} $(CFLAGS) -O3 -Wall -ansi -pedantic -Isrc -c $< -o $@
|
||||
+ ${CC} $(CFLAGS) -O3 -Wall -Wextra -ansi -pedantic -Isrc -c $< -o $@
|
||||
|
||||
ex01: objects/ex01.o libalpng.a
|
||||
- gcc $(LDFLAGS) -s -O3 -Wall -Wextra -ansi -pedantic $^ -o $@ -Isrc -L. `allegro-config --libs`
|
||||
+ ${CC} $(LDFLAGS) -s -O3 -Wall -ansi -pedantic $^ -o $@ -Isrc -L. `allegro-config --libs`
|
||||
+ ${CC} $(LDFLAGS) -s -O3 -Wall -Wextra -ansi -pedantic $^ -o $@ -Isrc -L. `allegro-config --libs`
|
||||
|
||||
|
||||
clean:
|
||||
|
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-examples_Makefile_am,v 1.1.1.1 2010/06/06 13:43:19 sthen Exp $
|
||||
--- examples/Makefile.am.orig Sat Nov 14 13:48:58 2009
|
||||
+++ examples/Makefile.am Sat Nov 14 13:49:12 2009
|
||||
$OpenBSD: patch-examples_Makefile_am,v 1.2 2013/11/02 11:13:19 ajacoutot Exp $
|
||||
--- examples/Makefile.am.orig Fri Apr 4 17:04:18 2008
|
||||
+++ examples/Makefile.am Sat Nov 2 12:02:56 2013
|
||||
@@ -1,5 +1,5 @@
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/include
|
||||
-AM_CFLAGS = -Wall -Wextra -Wno-unused-parameter
|
||||
+AM_CFLAGS = -Wall -Wno-unused-parameter
|
||||
+AM_CFLAGS = -Wall -Wextra
|
||||
|
||||
noinst_PROGRAMS = simplegrab
|
||||
|
||||
|
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-examples_Makefile_in,v 1.1.1.1 2010/06/06 13:43:19 sthen Exp $
|
||||
$OpenBSD: patch-examples_Makefile_in,v 1.2 2013/11/02 11:13:19 ajacoutot Exp $
|
||||
--- examples/Makefile.in.orig Fri Apr 4 17:22:20 2008
|
||||
+++ examples/Makefile.in Wed May 19 17:23:22 2010
|
||||
+++ examples/Makefile.in Sat Nov 2 12:03:13 2013
|
||||
@@ -195,7 +195,7 @@ target_alias = @target_alias@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/include
|
||||
-AM_CFLAGS = -Wall -Wextra -Wno-unused-parameter
|
||||
+AM_CFLAGS = -Wall
|
||||
+AM_CFLAGS = -Wall -Wextra
|
||||
simplegrab_LDADD = $(PTHREAD_LIBS) $(top_builddir)/src/libvidcap.la
|
||||
simplegrab_CFLAGS = $(PTHREAD_CFLAGS)
|
||||
AM_LDFLAGS = $(PTHREAD_CFLAGS) $(am__append_1)
|
||||
|
@ -1,14 +1,14 @@
|
||||
$OpenBSD: patch-src_Makefile_am,v 1.1.1.1 2010/06/06 13:43:19 sthen Exp $
|
||||
--- src/Makefile.am.orig Sat Nov 14 13:49:39 2009
|
||||
+++ src/Makefile.am Sat Nov 14 13:49:52 2009
|
||||
$OpenBSD: patch-src_Makefile_am,v 1.2 2013/11/02 11:13:19 ajacoutot Exp $
|
||||
--- src/Makefile.am.orig Fri Apr 4 17:04:17 2008
|
||||
+++ src/Makefile.am Sat Nov 2 12:04:00 2013
|
||||
@@ -3,8 +3,8 @@ AUTOMAKE_OPTIONS = subdir-objects
|
||||
lib_LTLIBRARIES = libvidcap.la
|
||||
|
||||
libvidcap_la_CPPFLAGS = -I$(top_srcdir)/include
|
||||
-libvidcap_la_CFLAGS = -Wall -Wextra -Wno-unused-parameter $(PTHREAD_CFLAGS)
|
||||
-libvidcap_la_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter $(PTHREAD_CFLAGS)
|
||||
+libvidcap_la_CFLAGS = -Wall -Wno-unused-parameter $(PTHREAD_CFLAGS)
|
||||
+libvidcap_la_CXXFLAGS = -Wall -Wno-unused-parameter $(PTHREAD_CFLAGS)
|
||||
+libvidcap_la_CFLAGS = -Wall -Wextra $(PTHREAD_CFLAGS)
|
||||
+libvidcap_la_CXXFLAGS = -Wall -Wextra $(PTHREAD_CFLAGS)
|
||||
|
||||
libvidcap_la_LIBADD = $(PTHREAD_LIBS)
|
||||
|
||||
|
@ -1,13 +1,13 @@
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2010/06/06 13:43:19 sthen Exp $
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.2 2013/11/02 11:13:19 ajacoutot Exp $
|
||||
--- src/Makefile.in.orig Fri Apr 4 17:22:20 2008
|
||||
+++ src/Makefile.in Wed May 19 17:22:47 2010
|
||||
+++ src/Makefile.in Sat Nov 2 12:04:27 2013
|
||||
@@ -270,8 +270,8 @@ top_srcdir = @top_srcdir@
|
||||
AUTOMAKE_OPTIONS = subdir-objects
|
||||
lib_LTLIBRARIES = libvidcap.la
|
||||
libvidcap_la_CPPFLAGS = -I$(top_srcdir)/include
|
||||
-libvidcap_la_CFLAGS = -Wall -Wextra -Wno-unused-parameter $(PTHREAD_CFLAGS)
|
||||
-libvidcap_la_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter $(PTHREAD_CFLAGS)
|
||||
+libvidcap_la_CFLAGS = -Wall $(PTHREAD_CFLAGS)
|
||||
+libvidcap_la_CFLAGS = -Wall -Wextra $(PTHREAD_CFLAGS)
|
||||
+libvidcap_la_CXXFLAGS = -Wall -Wextra $(PTHREAD_CFLAGS)
|
||||
libvidcap_la_LIBADD = $(PTHREAD_LIBS)
|
||||
libvidcap_la_LDFLAGS = -no-undefined -version-info \
|
||||
|
@ -1,24 +1,15 @@
|
||||
$OpenBSD: patch-configure,v 1.1 2011/08/24 15:36:38 naddy Exp $
|
||||
$OpenBSD: patch-configure,v 1.2 2013/11/02 11:13:19 ajacoutot Exp $
|
||||
|
||||
Remove compiler options not available with gcc < 4.
|
||||
|
||||
--- configure.orig Tue Aug 23 21:52:22 2011
|
||||
+++ configure Tue Aug 23 21:52:33 2011
|
||||
@@ -11257,7 +11257,7 @@ fi
|
||||
$as_echo_n "checking if $CC allows signed enums... " >&6; }
|
||||
|
||||
ac_save_CFLAGS="$CFLAGS"
|
||||
-CFLAGS="$CFLAGS -Wall -Wextra -Werror"
|
||||
+CFLAGS="$CFLAGS -Wall -Werror"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
--- configure.orig Thu Apr 29 03:39:45 2010
|
||||
+++ configure Sat Nov 2 12:05:59 2013
|
||||
@@ -12730,7 +12730,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
|
||||
# Checks for typedefs, structures, and compiler characteristics.
|
||||
|
||||
if test "x$ac_cv_c_compiler_gnu" = xyes ; then
|
||||
- CFLAGS="$CFLAGS -Wall -Wextra -g -std=gnu99 -Wdeclaration-after-statement -Wno-unused"
|
||||
+ CFLAGS="$CFLAGS -Wall -g -std=gnu99 -Wno-unused"
|
||||
+ CFLAGS="$CFLAGS -Wall -Wextra -g -std=gnu99 -Wno-unused"
|
||||
fi
|
||||
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.22 2013/06/21 22:38:12 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.23 2013/11/02 11:13:19 ajacoutot Exp $
|
||||
|
||||
SHARED_ONLY = Yes
|
||||
|
||||
@ -40,12 +40,11 @@ USE_GMAKE = Yes
|
||||
LIBTOOL_FLAGS = --tag=disable-static
|
||||
|
||||
pre-configure:
|
||||
perl -pi -e 's,-Wextra,,g;' \
|
||||
-e 's,-Wno-missing-field-initializers,,g;' \
|
||||
${WRKSRC}/Makefile.in ${WRKSRC}/agent/Makefile.in \
|
||||
${WRKSRC}/nice/Makefile.in ${WRKSRC}/random/Makefile.in \
|
||||
${WRKSRC}/socket/Makefile.in ${WRKSRC}/stun/Makefile.in \
|
||||
${WRKSRC}/stun/tests/Makefile.in ${WRKSRC}/stun/tools/Makefile.in \
|
||||
${WRKSRC}/tests/Makefile.in
|
||||
perl -pi -e 's,-Wno-missing-field-initializers,,g' \
|
||||
${WRKSRC}/Makefile.in ${WRKSRC}/agent/Makefile.in \
|
||||
${WRKSRC}/nice/Makefile.in ${WRKSRC}/random/Makefile.in \
|
||||
${WRKSRC}/socket/Makefile.in ${WRKSRC}/stun/Makefile.in \
|
||||
${WRKSRC}/stun/tests/Makefile.in ${WRKSRC}/stun/tools/Makefile.in \
|
||||
${WRKSRC}/tests/Makefile.in
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-configure,v 1.8 2013/03/12 05:19:57 brad Exp $
|
||||
$OpenBSD: patch-configure,v 1.9 2013/11/02 11:13:19 ajacoutot Exp $
|
||||
--- configure.orig Tue Feb 19 21:18:59 2013
|
||||
+++ configure Mon Mar 11 19:55:11 2013
|
||||
@@ -4601,7 +4601,7 @@ fi
|
||||
@ -6,7 +6,7 @@ $OpenBSD: patch-configure,v 1.8 2013/03/12 05:19:57 brad Exp $
|
||||
WFLAGS=
|
||||
if test "x$ac_cv_c_compiler_gnu" = xyes; then
|
||||
- WFLAGS="-Wall -Wextra -Wstrict-aliasing -Wfloat-equal -Wno-comment -Wno-unused -Winit-self -Wno-missing-field-initializers"
|
||||
+ WFLAGS="-Wall -Wfloat-equal -Wno-comment -Wno-unused -Winit-self -Wno-missing-field-initializers"
|
||||
+ WFLAGS="-Wall -Wextra -Wfloat-equal -Wno-comment -Wno-unused -Winit-self -Wno-missing-field-initializers"
|
||||
fi
|
||||
|
||||
CFLAGS="$CFLAGS $WFLAGS"
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-configure,v 1.7 2012/11/27 08:15:12 ajacoutot Exp $
|
||||
$OpenBSD: patch-configure,v 1.8 2013/11/02 11:13:19 ajacoutot Exp $
|
||||
--- configure.orig Mon Nov 26 20:52:20 2012
|
||||
+++ configure Tue Nov 27 08:46:11 2012
|
||||
@@ -16536,8 +16536,8 @@ fi
|
||||
@ -7,8 +7,8 @@ $OpenBSD: patch-configure,v 1.7 2012/11/27 08:15:12 ajacoutot Exp $
|
||||
if test ".$ac_cv_c_compiler_gnu" = .yes; then
|
||||
- CFLAGS="$CFLAGS -Wall -Wextra -Winit-self -Wswitch-default -Wswitch-enum -Wstrict-aliasing=2 -Wfloat-equal -Wshadow"
|
||||
- CXXFLAGS="$CXXFLAGS -Wall -Wextra -Winit-self -Wswitch-default -Wswitch-enum -Wstrict-aliasing=2 -Wfloat-equal -Wshadow"
|
||||
+ CFLAGS="$CFLAGS -Wall -Wswitch-default -Wswitch-enum -Wfloat-equal -Wshadow"
|
||||
+ CXXFLAGS="$CXXFLAGS -Wall -Wswitch-default -Wswitch-enum -Wfloat-equal -Wshadow"
|
||||
+ CFLAGS="$CFLAGS -Wall -Wextra -Wswitch-default -Wswitch-enum -Wfloat-equal -Wshadow"
|
||||
+ CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wswitch-default -Wswitch-enum -Wfloat-equal -Wshadow"
|
||||
fi
|
||||
|
||||
case $host in
|
||||
|
Loading…
Reference in New Issue
Block a user