Mon Mar 30 19:36:39 2020 UTC ()
Don't force UBsan. Fix kqueue fallout on NetBSD


(joerg)
diff -r1.11 -r1.12 pkgsrc/games/devilutionx/Makefile
diff -r1.7 -r1.8 pkgsrc/games/devilutionx/distinfo
diff -r0 -r1.1 pkgsrc/games/devilutionx/patches/patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp
cvs diff -r1.11 -r1.12 pkgsrc/games/devilutionx/Makefile (expand / switch to unified diff)

--- pkgsrc/games/devilutionx/Makefile 2020/03/09 10:53:22 1.11
+++ pkgsrc/games/devilutionx/Makefile 2020/03/30 19:36:39 1.12
@@ -1,39 +1,39 @@ @@ -1,39 +1,39 @@
1# $NetBSD: Makefile,v 1.11 2020/03/09 10:53:22 nia Exp $ 1# $NetBSD: Makefile,v 1.12 2020/03/30 19:36:39 joerg Exp $
2 2
3DISTNAME= devilutionx-1.0.1 3DISTNAME= devilutionx-1.0.1
4CATEGORIES= games 4CATEGORIES= games
5MASTER_SITES= ${MASTER_SITE_GITHUB:=diasurgical/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=diasurgical/}
6GITHUB_PROJECT= devilutionX 6GITHUB_PROJECT= devilutionX
7 7
8MAINTAINER= nia@NetBSD.org 8MAINTAINER= nia@NetBSD.org
9HOMEPAGE= https://github.com/diasurgical/devilutionX 9HOMEPAGE= https://github.com/diasurgical/devilutionX
10COMMENT= Port of the RPG Diablo for modern operating systems 10COMMENT= Port of the RPG Diablo for modern operating systems
11LICENSE= unlicense 11LICENSE= unlicense
12 12
13WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV} 13WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV}
14 14
15USE_CMAKE= yes 15USE_CMAKE= yes
16USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
17USE_LANGUAGES= c c++14 17USE_LANGUAGES= c c++14
18 18
19# std::make_unique, etc 19# std::make_unique, etc
20GCC_REQD+= 5 20GCC_REQD+= 5
21 21
22CONFIGURE_DIRS= build 22CONFIGURE_DIRS= build
23CMAKE_ARG_PATH= .. 23CMAKE_ARG_PATH= ..
24 24
25CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release" 25CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
26CMAKE_ARGS+= -DASAN=OFF 26CMAKE_ARGS+= -DASAN=OFF -DUBSAN=OFF
27CMAKE_ARGS+= -DDEBUG=OFF 27CMAKE_ARGS+= -DDEBUG=OFF
28CMAKE_ARGS+= -DFASTER=OFF 28CMAKE_ARGS+= -DFASTER=OFF
29 29
30.include "../../mk/bsd.prefs.mk" 30.include "../../mk/bsd.prefs.mk"
31 31
32.if ${OPSYS} != "Linux" 32.if ${OPSYS} != "Linux"
33CXXFLAGS+= -DO_LARGEFILE=0 -Dstat64=stat -Dlstat64=lstat -Dlseek64=lseek -Doff64_t=off_t -Dfstat64=fstat -Dftruncate64=ftruncate 33CXXFLAGS+= -DO_LARGEFILE=0 -Dstat64=stat -Dlstat64=lstat -Dlseek64=lseek -Doff64_t=off_t -Dfstat64=fstat -Dftruncate64=ftruncate
34.endif 34.endif
35 35
36# /usr/include/g++/cstdio:176:11: error: '::vfscanf' has not been declared 36# /usr/include/g++/cstdio:176:11: error: '::vfscanf' has not been declared
37# No idea. 37# No idea.
38CXXFLAGS.NetBSD+= -D_NETBSD_SOURCE 38CXXFLAGS.NetBSD+= -D_NETBSD_SOURCE
39 39
cvs diff -r1.7 -r1.8 pkgsrc/games/devilutionx/distinfo (expand / switch to unified diff)

--- pkgsrc/games/devilutionx/distinfo 2020/03/09 10:53:22 1.7
+++ pkgsrc/games/devilutionx/distinfo 2020/03/30 19:36:39 1.8
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.7 2020/03/09 10:53:22 nia Exp $ 1$NetBSD: distinfo,v 1.8 2020/03/30 19:36:39 joerg Exp $
2 2
3SHA1 (devilutionx-1.0.1.tar.gz) = 891c1b2d1956e8d7cef14d486e99f448c98a6694 3SHA1 (devilutionx-1.0.1.tar.gz) = 891c1b2d1956e8d7cef14d486e99f448c98a6694
4RMD160 (devilutionx-1.0.1.tar.gz) = 07bb1f4afef0a354b717add0afb0528689258868 4RMD160 (devilutionx-1.0.1.tar.gz) = 07bb1f4afef0a354b717add0afb0528689258868
5SHA512 (devilutionx-1.0.1.tar.gz) = 8c08db37664f4d9971650675866671411fe0fc00fedf4d2b2db040d48fc07e36def3bd78fa892c2be012d46df9519f28a31fe0b3e14f46e1037476458f60cb6d 5SHA512 (devilutionx-1.0.1.tar.gz) = 8c08db37664f4d9971650675866671411fe0fc00fedf4d2b2db040d48fc07e36def3bd78fa892c2be012d46df9519f28a31fe0b3e14f46e1037476458f60cb6d
6Size (devilutionx-1.0.1.tar.gz) = 2005920 bytes 6Size (devilutionx-1.0.1.tar.gz) = 2005920 bytes
 7SHA1 (patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp) = fdbfcc0d6e796a060d66013fcd59df6ef9383769
File Added: pkgsrc/games/devilutionx/patches/patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp
$NetBSD: patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp,v 1.1 2020/03/30 19:36:39 joerg Exp $

--- 3rdParty/asio/include/asio/detail/impl/kqueue_reactor.ipp.orig	2020-03-09 00:37:54.000000000 +0000
+++ 3rdParty/asio/include/asio/detail/impl/kqueue_reactor.ipp
@@ -28,6 +28,9 @@
 #include "asio/detail/push_options.hpp"
 
 #if defined(__NetBSD__)
+#include <sys/param.h>
+#endif
+#if defined(__NetBSD__) && (__NetBSD_Version__ - 0 < 999001500)
 # define ASIO_KQUEUE_EV_SET(ev, ident, filt, flags, fflags, data, udata) \
     EV_SET(ev, ident, filt, flags, fflags, data, \
       reinterpret_cast<intptr_t>(static_cast<void*>(udata)))