Re: emulators/nono fix for clang 13 (was: Re: LLVM 13 ports build failures (2021-12-04))

Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/nono/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile 5 Oct 2021 10:15:59 -0000 1.17
+++ Makefile 7 Dec 2021 09:51:27 -0000
@@ -6,7 +6,7 @@ BROKEN-i386= requires __m128i and simil

COMMENT= OMRON LUNA-I and LUNA-88K emulator

-DISTNAME= nono-0.2.2
+DISTNAME= nono-0.2.4
CATEGORIES= emulators

MAINTAINER= Gonzalo L. R. <gonzalo@openbsd.org>
@@ -29,6 +29,9 @@ LIB_DEPENDS= x11/wxWidgets

NO_TEST= Yes
CONFIGURE_STYLE= gnu
+
+post-extract:
+ sed -i 's/-Werror//g' ${WRKSRC}/Makefile.inc

post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nono
Index: distinfo
===================================================================
RCS file: /cvs/ports/emulators/nono/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo 5 Oct 2021 10:15:59 -0000 1.10
+++ distinfo 7 Dec 2021 09:51:27 -0000
@@ -1,2 +1,2 @@
-SHA256 (nono-0.2.2.tar.gz) = r0XLb0w7LBsDYf6An0xkR2rns8hzqk1UwFezHrMDN30=
-SIZE (nono-0.2.2.tar.gz) = 2574001
+SHA256 (nono-0.2.4.tar.gz) = qscokp95lFkihZ+HakeJMNyHu2zi/TY/DO1zjCq51ns=
+SIZE (nono-0.2.4.tar.gz) = 2655094
Index: patches/patch-debugger_debugger_private_h
===================================================================
RCS file: patches/patch-debugger_debugger_private_h
diff -N patches/patch-debugger_debugger_private_h
--- patches/patch-debugger_debugger_private_h 15 Jul 2021 05:01:38 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,37 +0,0 @@
-$OpenBSD: patch-debugger_debugger_private_h,v 1.2 2021/07/15 05:01:38 daniel Exp $
-
-Index: debugger/debugger_private.h
---- debugger/debugger_private.h.orig
-+++ debugger/debugger_private.h
-@@ -125,11 +125,11 @@ class Debugger final : public Object
- Quit, // デバッガとの接続を終了する
- };
- using cmdfunc_t = void (Debugger::*)();
-- typedef struct {
-+ struct cmddef_t {
- const char *name;
- cmdfunc_t func;
- CommandAction action;
-- } cmddef_t;
-+ };
-
- // ブレークポイント種別
- enum BreakpointType {
-@@ -141,7 +141,7 @@ class Debugger final : public Object
- };
-
- // ブレークポイント
-- typedef struct {
-+ struct breakpoint_t {
- BreakpointType type {}; // 種別
- // 種別ごとのパラメータ
- union {
-@@ -164,7 +164,7 @@ class Debugger final : public Object
- // n(>0) なら n 回の成立をスキップし、(n+1) 回目でブレークの意。
- int32 skip {}; // スキップ回数 (ユーザ指定値)
- int32 skipremain {}; // 残りスキップ回数 (0 で成立)
-- } breakpoint_t;
-+ };
- static const int MAX_BREAKPOINTS = 8;
-
- public:
Index: pkg/README
===================================================================
RCS file: /cvs/ports/emulators/nono/pkg/README,v
retrieving revision 1.4
diff -u -p -r1.4 README
--- pkg/README 5 Oct 2021 10:15:59 -0000 1.4
+++ pkg/README 7 Dec 2021 09:51:27 -0000
@@ -52,7 +52,14 @@ The config file nono.cfg inside ~/nono s
vmtype = luna88k
spc0-id6-image = hd,liveimage-luna88k-raw-20210614.img
hostnet-driver = none
+hostcom-driver = tcp
+hostcom-tcp-port = 9999
+luna-dipsw1 = 10111111

To turn it on:

-$ nono -c ~/nono -s 0.5 -C -Lhostname=1
+$ nono -c ~/nono -s 0.5 -C
+
+From the host machine:
+
+$ telnet localhost 9999
On Mon, 06 Dec 2021 at 23:43:12 +0100, Jeremie Courreges-Anglas wrote:
> On Sun, Dec 05 2021, Christian Weisgerber <naddy@mips.inka.de> wrote:
> > I ran another amd64 bulk build with base clang updated to LLVM 13
> > and --allow-shlib-undefined as the default again (~patrick/llvm.v6).
> > I also put in a tentative fix for security/nss.
> >
> > Failure logs:
> > http://build-failures.rhaalovely.net/amd64-clang/2021-12-04/
> >
> > Triage:
>
> > emulators/nono -Werror,-Wunused-but-set-variable
>
> Looks as simple as dropping -Werror. ok?
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/emulators/nono/Makefile,v
> retrieving revision 1.17
> diff -u -p -r1.17 Makefile
> --- Makefile 5 Oct 2021 10:15:59 -0000 1.17
> +++ Makefile 6 Dec 2021 22:40:01 -0000
> @@ -30,6 +30,9 @@ LIB_DEPENDS= x11/wxWidgets
> NO_TEST= Yes
> CONFIGURE_STYLE= gnu
>
> +post-extract:
> + sed -i 's/-Werror//g' ${WRKSRC}/Makefile.inc
> +
> post-install:
> ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nono
> ${INSTALL_DATA} ${WRKSRC}/doc/index.html ${PREFIX}/share/doc/nono/manual.html
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
>

Whoops I didn't see this one, how about with the update included?

OK?

--

%gonzalo