diff options
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/haxm/Makefile | 5 | ||||
| -rw-r--r-- | emulators/haxm/distinfo | 9 | ||||
| -rw-r--r-- | emulators/haxm/patches/patch-include_netbsd_hax__netbsd.h | 17 |
3 files changed, 25 insertions, 6 deletions
diff --git a/emulators/haxm/Makefile b/emulators/haxm/Makefile index e95c30e2481..154173af426 100644 --- a/emulators/haxm/Makefile +++ b/emulators/haxm/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.19 2021/05/31 12:58:50 nia Exp $ +# $NetBSD: Makefile,v 1.20 2022/02/05 03:25:56 ryoon Exp $ -DISTNAME= haxm-7.5.6 +DISTNAME= haxm-7.7.0 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_GITHUB:=intel/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -18,6 +18,7 @@ BUILD_DEPENDS+= nasm-[0-9]*:../../devel/nasm BUILD_DIRS= platforms/netbsd +MKPIE_SUPPORTED= no .include "../../mk/bsd.prefs.mk" BUILDLINK_PASSTHRU_DIRS+= ${BSDSRCDIR}/sys diff --git a/emulators/haxm/distinfo b/emulators/haxm/distinfo index 4ad9a4bed41..ffb2f7d4069 100644 --- a/emulators/haxm/distinfo +++ b/emulators/haxm/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.11 2021/10/26 10:23:52 nia Exp $ +$NetBSD: distinfo,v 1.12 2022/02/05 03:25:56 ryoon Exp $ -BLAKE2s (haxm-7.5.6.tar.gz) = f7527c13cd9a1e6033819aee54ef74eed4a6a477e0976e5f7c98d4e48a9c5114 -SHA512 (haxm-7.5.6.tar.gz) = 27a837f53450e9768ced9478bef2272d2d68db0c4136e9db7c9bdf96cb185592f6d2aba4f50cb7de493e9a0a0e1a1ed9d1f40c3742c15c36515e3f615a51054f -Size (haxm-7.5.6.tar.gz) = 241086 bytes +BLAKE2s (haxm-7.7.0.tar.gz) = 333ceb5de11037552de8b330ed90500ec0a8e96d48acd11d84ba2354b888ca79 +SHA512 (haxm-7.7.0.tar.gz) = 195bd0deb1b0c83ffbcff87a9f5f88029cf0169ef2bcb86219c4f1f4fa34ef4297b1b65376ffd44627f23794231a914d5c059acd17068554591ccd0c7aa0d74e +Size (haxm-7.7.0.tar.gz) = 367425 bytes +SHA1 (patch-include_netbsd_hax__netbsd.h) = d1210e10e0f425ea7fb08f9aa8485128bc55c64b diff --git a/emulators/haxm/patches/patch-include_netbsd_hax__netbsd.h b/emulators/haxm/patches/patch-include_netbsd_hax__netbsd.h new file mode 100644 index 00000000000..e1ca81de608 --- /dev/null +++ b/emulators/haxm/patches/patch-include_netbsd_hax__netbsd.h @@ -0,0 +1,17 @@ +$NetBSD: patch-include_netbsd_hax__netbsd.h,v 1.1 2022/02/05 03:25:56 ryoon Exp $ + +* Upstream master branch resolves this problem in another way. + Please remove this in next update (after 7.7.0). + +--- include/netbsd/hax_netbsd.h.orig 2021-05-24 08:15:13.000000000 +0000 ++++ include/netbsd/hax_netbsd.h +@@ -34,6 +34,9 @@ + + #define HAX_RAM_ENTRY_SIZE 0x4000000 + ++#define min(a,b) (((a)<(b))?(a):(b)) ++#define max(a,b) (((a)>(b))?(a):(b)) ++ + hax_spinlock *hax_spinlock_alloc_init(void); + void hax_spinlock_free(hax_spinlock *lock); + void hax_spin_lock(hax_spinlock *lock); |