Unbreak widelands build with cmake 3.15.x by removing build flags and
adding LDFLAGS. Because I'm just here,
CMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON added.
OK?
RS
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/widelands/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- Makefile 24 Jun 2019 10:12:06 -0000 1.25
+++ Makefile 18 Aug 2019 13:44:04 -0000
@@ -8,6 +8,7 @@ DISTNAME = widelands-build${V}
PKGNAME= widelands-0.${V}
CATEGORIES= games
EXTRACT_SUFX= .tar.bz2
+REVISION= 0
HOMEPAGE= https://wl.widelands.org/
MASTER_SITES = https://launchpad.net/widelands/build${V}/build${V}/+download/
@@ -40,12 +41,13 @@ MODULES = devel/cmake \
MODPY_RUNDEP= No
CONFIGURE_ARGS = -DWL_INSTALL_DATADIR=${PREFIX}/share/widelands \
- -DWL_INSTALL_BASEDIR=${PREFIX}/share/widelands
+ -DWL_INSTALL_BASEDIR=${PREFIX}/share/widelands \
+ -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
CONFIGURE_ENV = CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include \
-I${X11BASE}/include" \
- LDFLAGS="${LDFLAGS} -lexecinfo -lintl -liconv \
- -L${LOCALBASE}/lib"
+ LDFLAGS="${LDFLAGS} -lGL -lexecinfo -lintl -liconv \
+ -L${LOCALBASE}/lib -L${X11BASE}/lib"
NO_TEST= Yes
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/games/widelands/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 24 Jun 2019 10:12:06 -0000 1.3
+++ patches/patch-CMakeLists_txt 18 Aug 2019 13:44:04 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-CMakeLists_txt,v 1.3 2019/06/24 10:12:06 bentley Exp $
-Don't set -O3.
-
-Don't install source docs.
+- Don't set -O3.
+- Don't install source docs.
+- Unbreak build with cmake 3.15
Index: CMakeLists.txt
--- CMakeLists.txt.orig
@@ -29,6 +29,24 @@ Index: CMakeLists.txt
set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
option(OPTION_ASAN "Build with AddressSanitizer" ON)
else()
+@@ -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")
+
+- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=deprecated")
++ #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=deprecated")
+ wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=non-pod-varargs")
+
+ wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Qunused-arguments")
+@@ -261,7 +249,7 @@ endif()
+ # Turn some warnings into errors.
+ wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=format-security")
+ wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=return-type")
+-wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=shadow")
++#wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=shadow")
+ wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=uninitialized")
+
+ IF (WIN32)
@@ -367,15 +355,6 @@ install(
DESTINATION ${WL_INSTALL_BASEDIR}
CONFIGURATIONS Debug;Release
