-Wextra is supported by both our gcc.

This commit is contained in:
ajacoutot 2013-11-02 10:43:04 +00:00
parent 4fdb1b1125
commit 04d17f1b94
5 changed files with 15 additions and 48 deletions

View File

@ -1,17 +1,13 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1 2011/09/05 14:56:24 naddy Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.2 2013/11/02 10:43:04 ajacoutot Exp $
Check for compiler flags not available with gcc < 4.
--- CMakeLists.txt.orig Fri Aug 26 13:53:40 2011
+++ CMakeLists.txt Fri Aug 26 13:57:43 2011
@@ -54,9 +54,18 @@ ELSE (WIN32)
--- CMakeLists.txt.orig Tue Dec 20 01:23:22 2011
+++ CMakeLists.txt Sat Nov 2 11:38:51 2013
@@ -54,9 +54,14 @@ ELSE (WIN32)
IF(HAVE_GCC_VISIBILITY)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
ENDIF(HAVE_GCC_VISIBILITY)
+ CHECK_C_COMPILER_FLAG(-Wextra HAVE_GCC_WEXTRA)
+ IF(HAVE_GCC_WEXTRA)
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra")
+ ENDIF(HAVE_GCC_WEXTRA)
+ CHECK_C_COMPILER_FLAG(-Wold-style-definition HAVE_GCC_WOLDSTYLE)
+ IF(HAVE_GCC_WOLDSTYLE)
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wold-style-definition")
@ -19,7 +15,7 @@ Check for compiler flags not available with gcc < 4.
ENDIF(CMAKE_COMPILER_IS_GNUCC)
SET(CMAKE_C_FLAGS
- "${CMAKE_C_FLAGS} -std=c99 -pedantic -Wpointer-arith -Wno-format-y2k -Wstrict-prototypes -Wmissing-declarations -Wnested-externs -Wextra -Wundef -Wwrite-strings -Wold-style-definition -Wredundant-decls -Wno-unused-parameter -Wno-sign-compare -Wmissing-prototypes")
+ "${CMAKE_C_FLAGS} -std=c99 -pedantic -Wpointer-arith -Wno-format-y2k -Wstrict-prototypes -Wmissing-declarations -Wnested-externs -Wundef -Wwrite-strings -Wredundant-decls -Wno-unused-parameter -Wno-sign-compare -Wmissing-prototypes")
+ "${CMAKE_C_FLAGS} -std=c99 -pedantic -Wpointer-arith -Wno-format-y2k -Wstrict-prototypes -Wmissing-declarations -Wnested-externs -Wextra -Wundef -Wwrite-strings -Wredundant-decls -Wno-unused-parameter -Wno-sign-compare -Wmissing-prototypes")
+
SET(CMAKE_C_FLAGS_DEBUG "-DDEBUG -g")

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-CMakeLists_txt,v 1.3 2013/09/24 15:34:45 landry Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.4 2013/11/02 10:43:04 ajacoutot Exp $
--- CMakeLists.txt.orig Sun Dec 4 15:24:51 2011
+++ CMakeLists.txt Tue Sep 24 10:14:20 2013
@@ -99,10 +99,10 @@ IF(ENABLE_MINBIF)
@ -14,12 +14,3 @@ $OpenBSD: patch-CMakeLists_txt,v 1.3 2013/09/24 15:34:45 landry Exp $
ENDIF(NOT CONF_PREFIX)
IF(NOT DOC_PREFIX)
SET(DOC_PREFIX ${CMAKE_INSTALL_PREFIX}/share/doc/minbif)
@@ -127,7 +127,7 @@ ENDIF(ENABLE_PLUGIN)
INCLUDE_DIRECTORIES(${PURPLE_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS} ${CACA_INCLUDE_DIRS} ${IMLIB_INCLUDE_DIRS} ${GSTREAMER_INCLUDE_DIRS} ${FARSIGHT_INCLUDE_DIRS} ${LIBXML_INCLUDE_DIRS} ${PAM_INCLUDE_DIRS} ${GNUTLS_INCLUDE_DIRS} "src/")
LINK_DIRECTORIES(${PURPLE_LIBRARY_DIRS} ${GTHREAD_LIBRARY_DIRS} ${CACA_LIBRARY_DIRS} ${IMLIB_LIBRARY_DIRS} ${GSTREAMER_LIBRARY_DIRS} ${FARSIGHT_LIBRARY_DIRS} ${LIBXML_LIBRARY_DIRS} ${GNUTLS_LIBRARY_DIRS})
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_REENTRANT -D_FILE_OFFSET_BITS=64 -Wall -Wextra -Wno-unused-parameter")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_REENTRANT -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-parameter")
SET(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS})
IF(ENABLE_MINBIF)

View File

@ -1,23 +1,18 @@
$OpenBSD: patch-cmake_Modules_DefineCompilerFlags_cmake,v 1.1 2011/09/10 11:56:42 naddy Exp $
$OpenBSD: patch-cmake_Modules_DefineCompilerFlags_cmake,v 1.2 2013/11/02 10:43:04 ajacoutot Exp $
Check for compiler flags not available with gcc < 4.
--- cmake/Modules/DefineCompilerFlags.cmake.orig Fri Sep 9 21:36:39 2011
+++ cmake/Modules/DefineCompilerFlags.cmake Fri Sep 9 21:40:29 2011
@@ -10,9 +10,19 @@ if (UNIX AND NOT WIN32)
--- cmake/Modules/DefineCompilerFlags.cmake.orig Fri Jul 26 08:39:39 2013
+++ cmake/Modules/DefineCompilerFlags.cmake Sat Nov 2 11:37:07 2013
@@ -10,9 +10,14 @@ if (UNIX AND NOT WIN32)
if (${CMAKE_C_COMPILER_ID} MATCHES GNU)
# add -Wconversion ?
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -pedantic -pedantic-errors")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wshadow -Wmissing-prototypes -Wdeclaration-after-statement")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wshadow -Wmissing-prototypes")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wshadow -Wmissing-prototypes")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused -Wfloat-equal -Wpointer-arith -Wwrite-strings -Wformat-security")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-format-attribute")
+
+ check_c_compiler_flag("-Wextra" WITH_WEXTRA)
+ if (WITH_WEXTRA)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra")
+ endif (WITH_WEXTRA)
+
+ check_c_compiler_flag("-Wdeclaration-after-statement" WITH_WDECL)
+ if (WITH_WDECL)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wdeclaration-after-statement")

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_channels_c,v 1.3 2012/11/22 20:54:12 sthen Exp $
--- src/channels.c.orig Tue Nov 20 11:42:02 2012
+++ src/channels.c Thu Nov 22 11:29:05 2012
@@ -679,21 +679,21 @@ SSH_PACKET_CALLBACK(channel_rcv_request) {
$OpenBSD: patch-src_channels_c,v 1.4 2013/11/02 10:43:04 ajacoutot Exp $
--- src/channels.c.orig Fri Jul 26 08:42:26 2013
+++ src/channels.c Sat Nov 2 11:36:51 2013
@@ -683,21 +683,21 @@ SSH_PACKET_CALLBACK(channel_rcv_request) {
}
if (strcmp(request,"signal") == 0) {

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2010/08/25 17:37:41 jasper Exp $
Remove flag that's not supported by all three gcc versions.
--- src/Makefile.in.orig Wed Aug 25 19:27:06 2010
+++ src/Makefile.in Wed Aug 25 19:27:13 2010
@@ -176,7 +176,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CFLAGS = -Wall -Wextra -Wno-unused-parameter
+AM_CFLAGS = -Wall -Wno-unused-parameter
gnuvd_SOURCES = \
main.c \
gnuvd.c \