diff options
| author | dholland <dholland@pkgsrc.org> | 2014-06-28 21:20:06 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2014-06-28 21:20:06 +0000 |
| commit | 72a8c6a8a47d5f81f1f877c9dd6f6ef622873453 (patch) | |
| tree | e3e99e3bbc9c4abdf57032888c2c5b1277065c7f /emulators/wine-devel | |
| parent | 92eec63e9a11345aca1fbe68f7cfea58f431e855 (diff) | |
| download | pkgsrc-72a8c6a8a47d5f81f1f877c9dd6f6ef622873453.tar.gz | |
fix build failure on netbsd amd64
Diffstat (limited to 'emulators/wine-devel')
| -rw-r--r-- | emulators/wine-devel/distinfo | 3 | ||||
| -rw-r--r-- | emulators/wine-devel/patches/patch-dlls_ntdll_signal__x86__64.c | 27 |
2 files changed, 29 insertions, 1 deletions
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index 4676134c44d..514b4414f38 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.21 2014/01/19 10:58:23 adam Exp $ +$NetBSD: distinfo,v 1.22 2014/06/28 21:20:06 dholland Exp $ SHA1 (wine-1.7.11.tar.bz2) = ebe30cf1a93782a958e8b1e3ed898310c37676fe RMD160 (wine-1.7.11.tar.bz2) = ea565f9f46eeabf803cc5ab319469831a4afa93d Size (wine-1.7.11.tar.bz2) = 21359534 bytes SHA1 (patch-configure) = 2d540b149e59298ca0fcc43d50873c986fbe0140 +SHA1 (patch-dlls_ntdll_signal__x86__64.c) = 27cff56a8e3886298effbbfa5bbab5af9579d447 SHA1 (patch-dlls_wbemprox_builtin.c) = a11f910d8b94047f2dcf8b45c27fb1c6c3f3ce59 SHA1 (patch-dlls_wineoss.drv_mmdevdrv.c) = fc44346b889ee7486a92e9704a8447334f48f4d1 SHA1 (patch-dlls_ws2__32_socket.c) = 98ebaa7b0831e558f49a484ffb3a1b28adb9bcf2 diff --git a/emulators/wine-devel/patches/patch-dlls_ntdll_signal__x86__64.c b/emulators/wine-devel/patches/patch-dlls_ntdll_signal__x86__64.c new file mode 100644 index 00000000000..9370d4b3a7b --- /dev/null +++ b/emulators/wine-devel/patches/patch-dlls_ntdll_signal__x86__64.c @@ -0,0 +1,27 @@ +$NetBSD: patch-dlls_ntdll_signal__x86__64.c,v 1.1 2014/06/28 21:20:06 dholland Exp $ + +Teach this how to set %gs on NetBSD. Not actually tested as so far +Wine doesn't actually run, but fixes a build failure. + +--- dlls/ntdll/signal_x86_64.c~ 2014-01-17 19:48:48.000000000 +0000 ++++ dlls/ntdll/signal_x86_64.c +@@ -199,8 +199,9 @@ extern int arch_prctl(int func, void *pt + #define FPU_sig(context) ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.mc_fpstate)) + + #elif defined(__NetBSD__) +-#include <sys/ucontext.h> + #include <sys/types.h> ++#include <sys/sysarch.h> ++#include <sys/ucontext.h> + #include <signal.h> + + #define RAX_sig(context) ((context)->uc_mcontext.__gregs[_REG_RAX]) +@@ -2457,6 +2458,8 @@ void signal_init_thread( TEB *teb ) + arch_prctl( ARCH_SET_GS, teb ); + #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) + amd64_set_gsbase( teb ); ++#elif defined (__NetBSD__) ++ sysarch(X86_SET_GSBASE, &teb); + #else + # error Please define setting %gs for your architecture + #endif |