summaryrefslogtreecommitdiff
path: root/games/devilutionx
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2020-03-30 19:36:39 +0000
committerjoerg <joerg@pkgsrc.org>2020-03-30 19:36:39 +0000
commit6a513f7a17c458e84c0e978562b91e8d8a4d459f (patch)
tree980431ce7634c2559fe93cbaaf8d04110a022b1c /games/devilutionx
parentdc55bd6caa19cf7bffea5ad38a4530a263c6959e (diff)
downloadpkgsrc-6a513f7a17c458e84c0e978562b91e8d8a4d459f.tar.gz
Don't force UBsan. Fix kqueue fallout on NetBSD
Diffstat (limited to 'games/devilutionx')
-rw-r--r--games/devilutionx/Makefile4
-rw-r--r--games/devilutionx/distinfo3
-rw-r--r--games/devilutionx/patches/patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp14
3 files changed, 18 insertions, 3 deletions
diff --git a/games/devilutionx/Makefile b/games/devilutionx/Makefile
index f45475bd35a..4d71e75de04 100644
--- a/games/devilutionx/Makefile
+++ b/games/devilutionx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/03/09 10:53:22 nia Exp $
+# $NetBSD: Makefile,v 1.12 2020/03/30 19:36:39 joerg Exp $
DISTNAME= devilutionx-1.0.1
CATEGORIES= games
@@ -23,7 +23,7 @@ CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ..
CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
-CMAKE_ARGS+= -DASAN=OFF
+CMAKE_ARGS+= -DASAN=OFF -DUBSAN=OFF
CMAKE_ARGS+= -DDEBUG=OFF
CMAKE_ARGS+= -DFASTER=OFF
diff --git a/games/devilutionx/distinfo b/games/devilutionx/distinfo
index b27f75fe621..27bc7cac6bc 100644
--- a/games/devilutionx/distinfo
+++ b/games/devilutionx/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2020/03/09 10:53:22 nia Exp $
+$NetBSD: distinfo,v 1.8 2020/03/30 19:36:39 joerg Exp $
SHA1 (devilutionx-1.0.1.tar.gz) = 891c1b2d1956e8d7cef14d486e99f448c98a6694
RMD160 (devilutionx-1.0.1.tar.gz) = 07bb1f4afef0a354b717add0afb0528689258868
SHA512 (devilutionx-1.0.1.tar.gz) = 8c08db37664f4d9971650675866671411fe0fc00fedf4d2b2db040d48fc07e36def3bd78fa892c2be012d46df9519f28a31fe0b3e14f46e1037476458f60cb6d
Size (devilutionx-1.0.1.tar.gz) = 2005920 bytes
+SHA1 (patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp) = fdbfcc0d6e796a060d66013fcd59df6ef9383769
diff --git a/games/devilutionx/patches/patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp b/games/devilutionx/patches/patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp
new file mode 100644
index 00000000000..06d8a72f1d6
--- /dev/null
+++ b/games/devilutionx/patches/patch-3rdParty_asio_include_asio_detail_impl_kqueue__reactor.ipp
@@ -0,0 +1,14 @@
+$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)))