diff options
| author | adam <adam@pkgsrc.org> | 2019-09-03 20:27:02 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2019-09-03 20:27:02 +0000 |
| commit | 4ed2e2060d9b17c5b716a34d69f9456868a94774 (patch) | |
| tree | 69bcfc0c83b9a8c4128c559265c48a269281b69e /games/widelands | |
| parent | 49b6cf59c4b5a09ec7d6b7e1d15f9f1e3fd1aebf (diff) | |
| download | pkgsrc-4ed2e2060d9b17c5b716a34d69f9456868a94774.tar.gz | |
widelands: fix building on Darwin
Diffstat (limited to 'games/widelands')
| -rw-r--r-- | games/widelands/Makefile | 10 | ||||
| -rw-r--r-- | games/widelands/distinfo | 4 | ||||
| -rw-r--r-- | games/widelands/patches/patch-CMakeLists.txt | 15 |
3 files changed, 23 insertions, 6 deletions
diff --git a/games/widelands/Makefile b/games/widelands/Makefile index 7a334886f70..633468de5c0 100644 --- a/games/widelands/Makefile +++ b/games/widelands/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/08/22 12:23:15 ryoon Exp $ +# $NetBSD: Makefile,v 1.5 2019/09/03 20:27:02 adam Exp $ DISTNAME= widelands-build20 PKGNAME= widelands-20 @@ -35,8 +35,15 @@ PYTHON_FOR_BUILD_ONLY= yes INSTALLATION_DIRS+= bin INSTALLATION_DIRS+= share/doc/widelands +.include "../../mk/bsd.prefs.mk" + +# XXX: The following trick might not work everywhere! +# Some systems, like Darwin, do not provide pgettext(), +# and devel/gettext-lib does not provide it either. pre-configure: +.if ${OPSYS} != "Darwin" ${PRINTF} '#include <libintl.h>\n' > ${WRKSRC}/src/third_party/gettext/gettext.h +.endif ${MKDIR} ${WRKSRC}/build post-install: @@ -57,7 +64,6 @@ post-install: .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/SDL2_ttf/buildlink3.mk" .include "../../graphics/SDL2_image/buildlink3.mk" -.include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glew/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../lang/python/pyversion.mk" diff --git a/games/widelands/distinfo b/games/widelands/distinfo index 0d41d7ff5b4..e8024a9663f 100644 --- a/games/widelands/distinfo +++ b/games/widelands/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.1 2019/08/06 19:42:20 nia Exp $ +$NetBSD: distinfo,v 1.2 2019/09/03 20:27:02 adam Exp $ SHA1 (widelands-build20.tar.bz2) = a2fdedf81c08fd08809b8556c955a6a7f32c1eed RMD160 (widelands-build20.tar.bz2) = 4adfa2f3ae2e4ceae7a04ca1162deed0f3e7632f SHA512 (widelands-build20.tar.bz2) = 25280db6a57adeb37d13db35ce9eb41a5478534b04772240f6228c180f5a41a55fc414dab66e724945442985cbbba7a8a59a582291aca176e0bd8ae6c08760e5 Size (widelands-build20.tar.bz2) = 232364340 bytes -SHA1 (patch-CMakeLists.txt) = c049c7a9226d7fad9d0ddb984e9d4707b22bf635 +SHA1 (patch-CMakeLists.txt) = 8b400bc5554964378275d304943e6489c82d9915 SHA1 (patch-src_CMakeLists.txt) = 3d06616eefa3145ff0062c39b4ce026e0acad8c1 diff --git a/games/widelands/patches/patch-CMakeLists.txt b/games/widelands/patches/patch-CMakeLists.txt index 64074e6cfac..accfe2a5837 100644 --- a/games/widelands/patches/patch-CMakeLists.txt +++ b/games/widelands/patches/patch-CMakeLists.txt @@ -1,7 +1,9 @@ -$NetBSD: patch-CMakeLists.txt,v 1.1 2019/08/06 19:42:20 nia Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.2 2019/09/03 20:27:02 adam Exp $ Support NetBSD. +Do not turn warnings into errors. + --- CMakeLists.txt.orig 2019-05-02 05:23:39.000000000 +0000 +++ CMakeLists.txt @@ -113,6 +113,7 @@ endif() @@ -12,7 +14,16 @@ Support NetBSD. CMAKE_SYSTEM_NAME MATCHES "OpenBSD") if (NOT CMAKE_SYSTEM_NAME MATCHES "kFreeBSD") find_package(intl REQUIRED) -@@ -275,7 +276,9 @@ IF (WIN32) +@@ -210,8 +211,6 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL " + 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=non-pod-varargs") + + wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Qunused-arguments") + +@@ -275,7 +274,9 @@ IF (WIN32) endif (WIN32) # on BSD this must be explicitly linked |