naddy@ reported build output explosion in the latest bulk after cmake
update.
I would suggest turning off the compiler flags. I think this will also
help sparc64 if I understand the BROKEN message correctly.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/widelands/Makefile,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 Makefile
--- Makefile 21 Aug 2019 05:47:33 -0000 1.26
+++ Makefile 22 Aug 2019 15:14:26 -0000
@@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.26 2019/08/21 05:47:33 rsadowski Exp $
COMMENT= economic and military simulation game
-BROKEN-sparc64= generates 240Mb log with 'terminate called recursively'
V = 20
DISTNAME = widelands-build${V}
PKGNAME= widelands-0.${V}
CATEGORIES= games
EXTRACT_SUFX= .tar.bz2
-REVISION= 0
+REVISION= 1
HOMEPAGE= https://wl.widelands.org/
MASTER_SITES = https://launchpad.net/widelands/build${V}/build${V}/+download/
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/games/widelands/patches/patch-CMakeLists_txt,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 21 Aug 2019 05:47:33 -0000 1.4
+++ patches/patch-CMakeLists_txt 22 Aug 2019 15:14:26 -0000
@@ -3,6 +3,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.4 201
- Don't set -O3.
- Don't install source docs.
- Unbreak build with cmake 3.15
+- Disable many compile warnings
Index: CMakeLists.txt
--- CMakeLists.txt.orig
@@ -29,6 +30,15 @@ Index: CMakeLists.txt
set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
option(OPTION_ASAN "Build with AddressSanitizer" ON)
else()
+@@ -187,7 +175,7 @@ if("${OpenGL_GL_PREFERENCE}" STREQUAL "GLVND")
+ endif()
+
+ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Weverything")
++ #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Weverything")
+
+ # Disabled warnings that are overly verbose right now or just do not make sense.
+ wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-c++98-compat")
@@ -210,7 +198,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-unreachable-code")
wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-documentation")
@@ -38,7 +48,59 @@ Index: CMakeLists.txt
wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=non-pod-varargs")
wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Qunused-arguments")
-@@ -261,7 +249,7 @@ endif()
+@@ -232,36 +220,36 @@ else()
+ # Because of: https://svn.boost.org/trac/boost/ticket/9240.
+ wl_add_flag(WL_GENERIC_CXX_FLAGS "-fext-numeric-literals")
+
+- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wall")
+- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wpedantic")
+- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wdeprecated-declarations")
+- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wextra")
+- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wformat")
+- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wformat-nonliteral")
+- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wformat-security")
+- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wformat-y2k")
+- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Winit-self")
+- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Winvalid-pch")
+- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wlogical-op")
+- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wmissing-include-dirs")
+- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-undef")
+- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wold-style-cast")
+- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Woverlength-strings")
+- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wpacked")
+- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wpointer-arith")
+- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wsign-promo")
+- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wsync-nand")
+- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wtrampolines")
+- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wundef")
+- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wunused")
+- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wunused-macros")
++ #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wall")
++ #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wpedantic")
++ #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wdeprecated-declarations")
++ #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wextra")
++ #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wformat")
++ #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wformat-nonliteral")
++ #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wformat-security")
++ #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wformat-y2k")
++ #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Winit-self")
++ #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Winvalid-pch")
++ #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wlogical-op")
++ #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wmissing-include-dirs")
++ #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-undef")
++ #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wold-style-cast")
++ #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Woverlength-strings")
++ #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wpacked")
++ #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wpointer-arith")
++ #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wsign-promo")
++ #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wsync-nand")
++ #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wtrampolines")
++ #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wundef")
++ #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wunused")
++ #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wunused-macros")
+ endif()
+
+
# Turn some warnings into errors.
wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=format-security")
wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=return-type")
No comments:
Post a Comment