CVS commit: pkgsrc/emulators/qemu

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Mar 15 11:49:20 UTC 2023

Modified Files:
        pkgsrc/emulators/qemu: distinfo
Added Files:
        pkgsrc/emulators/qemu/patches:
            patch-meson_mesonbuild_linkers_linkers.py
            patch-util_coroutine-ucontext.c patch-util_osdep.c

Log Message:
qemu: Various SunOS fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.198 -r1.199 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/qemu/patches/patch-meson_mesonbuild_linkers_linkers.py \
    pkgsrc/emulators/qemu/patches/patch-util_coroutine-ucontext.c \
    pkgsrc/emulators/qemu/patches/patch-util_osdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/qemu/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.198 pkgsrc/emulators/qemu/distinfo:1.199
--- pkgsrc/emulators/qemu/distinfo:1.198        Fri Jan 20 08:36:24 2023
+++ pkgsrc/emulators/qemu/distinfo      Wed Mar 15 11:49:20 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.198 2023/01/20 08:36:24 adam Exp $
+$NetBSD: distinfo,v 1.199 2023/03/15 11:49:20 jperkin Exp $
 
 BLAKE2s (palcode-clipper-qemu-5.2.0nb8) = d388c896a80c1cc3d4785c8434d6688bbcfd54c28f7252ce550ab162a0bba321
 SHA512 (palcode-clipper-qemu-5.2.0nb8) = 33695d6001d86a19793a92d5e31775607c4dfc9ab9eea019ea6c4d543a2e11e8c07f83cca4934811a13ef829b528737ea37d9d2aaf66cba6f2746d44d2aa0b43
@@ -18,8 +18,11 @@ SHA1 (patch-hw_rtc_mc146818rtc.c) = cc7a
 SHA1 (patch-hw_scsi_scsi-disk.c) = fdbf2f962a6dcb1a115a7f8a5b8790ff9295fb33
 SHA1 (patch-hw_usb_dev-mtp.c) = 94ddf53a41cc75810cfece1b8aef1831fab4ce43
 SHA1 (patch-meson.build) = 67fcc428b1953a63e4c0aa32ac1d41ec234a2462
+SHA1 (patch-meson_mesonbuild_linkers_linkers.py) = 842b01f543c99c66630df8450f71ab9fc422ff32
 SHA1 (patch-roms_u-boot-sam460ex_Makefile) = 3a1bbf19b1422c10ebdd819eb0b711fafc78e2f2
 SHA1 (patch-target_arm_translate-sve.c) = f5909d20ea6f04bbc4a0d61d79f795bac24d6d86
 SHA1 (patch-target_i386_cpu.c) = afa8a2f83399b2d142709322eb88d1112f1547e4
 SHA1 (patch-target_i386_meson.build) = 0ef0636dd68e5eeb9a2a34473e2a24bf3c141c0f
 SHA1 (patch-target_sparc_translate.c) = 7ec2add2fd808facb48b9a66ccc345599251bf76
+SHA1 (patch-util_coroutine-ucontext.c) = 890767e1f034b34f4aad6c791745fc0b151b8e3c
+SHA1 (patch-util_osdep.c) = 1e5bcde7be23792f487334d35797869bff686d25

Added files:

Index: pkgsrc/emulators/qemu/patches/patch-meson_mesonbuild_linkers_linkers.py
diff -u /dev/null pkgsrc/emulators/qemu/patches/patch-meson_mesonbuild_linkers_linkers.py:1.1
--- /dev/null   Wed Mar 15 11:49:20 2023
+++ pkgsrc/emulators/qemu/patches/patch-meson_mesonbuild_linkers_linkers.py     Wed Mar 15 11:49:20 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-meson_mesonbuild_linkers_linkers.py,v 1.1 2023/03/15 11:49:20 jperkin Exp $
+
+qemu ships its own version of meson for some strange reason so we need to
+apply the same patch here too to avoid thin archives.
+
+--- meson/mesonbuild/linkers/linkers.py.orig   2022-12-14 16:29:34.000000000 +0000
++++ meson/mesonbuild/linkers/linkers.py
+@@ -197,7 +197,7 @@ class ArLinker(ArLikeLinker):
+         thinargs = ''
+         if '[D]' in stdo:
+             stdargs += 'D'
+-        if '[T]' in stdo:
++        if '[T]' in stdo and not mesonlib.is_sunos():
+             thinargs = 'T'
+         self.std_args = [stdargs]
+         self.std_thin_args = [stdargs + thinargs]
Index: pkgsrc/emulators/qemu/patches/patch-util_coroutine-ucontext.c
diff -u /dev/null pkgsrc/emulators/qemu/patches/patch-util_coroutine-ucontext.c:1.1
--- /dev/null   Wed Mar 15 11:49:20 2023
+++ pkgsrc/emulators/qemu/patches/patch-util_coroutine-ucontext.c       Wed Mar 15 11:49:20 2023
@@ -0,0 +1,19 @@
+$NetBSD: patch-util_coroutine-ucontext.c,v 1.1 2023/03/15 11:49:20 jperkin Exp $
+
+https://github.com/omniosorg/omnios-extra/blob/master/build/qemu/patches/0008-Temporary-coroutine-patch-pending-illumos-15206.patch
+
+--- util/coroutine-ucontext.c.orig     2022-12-14 16:28:45.000000000 +0000
++++ util/coroutine-ucontext.c
+@@ -305,6 +305,12 @@ qemu_coroutine_switch(Coroutine *from_,
+ 
+     ret = sigsetjmp(from->env, 0);
+     if (ret == 0) {
++#if defined(__sun)
++#define SIGJMP2UCONTEXT(x) ((ucontext_t *)P2ROUNDUP((uintptr_t)(x),  sizeof (upad128_t)))
++        ucontext_t *f = SIGJMP2UCONTEXT(from->env);
++        ucontext_t *t = SIGJMP2UCONTEXT(to->env);
++        t->uc_mcontext.gregs[REG_FSBASE] = f->uc_mcontext.gregs[REG_FSBASE];
++#endif
+         start_switch_fiber_asan(action, &fake_stack_save, to->stack,
+                                 to->stack_size);
+         start_switch_fiber_tsan(&fake_stack_save,
Index: pkgsrc/emulators/qemu/patches/patch-util_osdep.c
diff -u /dev/null pkgsrc/emulators/qemu/patches/patch-util_osdep.c:1.1
--- /dev/null   Wed Mar 15 11:49:20 2023
+++ pkgsrc/emulators/qemu/patches/patch-util_osdep.c    Wed Mar 15 11:49:20 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-util_osdep.c,v 1.1 2023/03/15 11:49:20 jperkin Exp $
+
+Don't use OFD locking on SunOS.
+https://github.com/omniosorg/omnios-extra/blob/master/build/qemu/patches/0002-illumos-OFD-locking-must-span-the-entire-file.patch
+
+--- util/osdep.c.orig  2022-12-14 16:28:45.000000000 +0000
++++ util/osdep.c
+@@ -31,6 +31,10 @@
+ #include "qemu/hw-version.h"
+ #include "monitor/monitor.h"
+ 
++#if defined(__sun)
++#undef F_OFD_SETLK
++#endif
++
+ static const char *hw_version = QEMU_HW_VERSION;
+ 
+ int socket_set_cork(int fd, int v)