aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjbeich <jbeich@FreeBSD.org>2019-09-11 19:47:01 +0800
committerjbeich <jbeich@FreeBSD.org>2019-09-11 19:47:01 +0800
commit64b2d9a844c0d31315d51f7ac11aafadba809f8a (patch)
tree5e9fcc8dca0af152d4483e1c75f81281a21b819d
parent9eb6cb61a01153a024fee63696895e1fffacddd8 (diff)
downloadfreebsd-ports-gnome-64b2d9a844c0d31315d51f7ac11aafadba809f8a.tar.gz
freebsd-ports-gnome-64b2d9a844c0d31315d51f7ac11aafadba809f8a.tar.zst
freebsd-ports-gnome-64b2d9a844c0d31315d51f7ac11aafadba809f8a.zip
emulators/rpcs3: unbreak WITH_DEBUG build
ld: error: undefined symbol: id_manager::id_traits<sys_vm_t, void>::invalid >>> referenced by sys_vm.cpp:19 (rpcs3/Emu/Cell/lv2/sys_vm.cpp:19) >>> sys_vm.cpp.o:(sys_vm_t::~sys_vm_t()) in archive rpcs3/Emu/librpcs3_emu.a
-rw-r--r--emulators/rpcs3/files/patch-rpcs3_Emu_IdManager.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/emulators/rpcs3/files/patch-rpcs3_Emu_IdManager.h b/emulators/rpcs3/files/patch-rpcs3_Emu_IdManager.h
new file mode 100644
index 000000000000..1691691d9a4f
--- /dev/null
+++ b/emulators/rpcs3/files/patch-rpcs3_Emu_IdManager.h
@@ -0,0 +1,13 @@
+https://github.com/RPCS3/rpcs3/issues/6529
+
+--- rpcs3/Emu/IdManager.h.orig 2019-09-09 16:16:02 UTC
++++ rpcs3/Emu/IdManager.h
+@@ -30,7 +30,7 @@ namespace id_manager
+ static const u32 base = T::id_base;
+ static const u32 step = T::id_step;
+ static const u32 count = T::id_count;
+- static const u32 invalid = base > 0 ? 0 : -1;
++ static constexpr u32 invalid = base > 0 ? 0 : -1;
+
+ // Note: full 32 bits range cannot be used at current implementation
+ static_assert(count > 0 && step > 0 && u64{step} * count + base < u64{UINT32_MAX} + (base != 0 ? 1 : 0), "ID traits: invalid object range");