CVS commit: pkgsrc/emulators/gxemul

["Jonathan A. Kollasch" <jakllsch%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jakllsch
Date:           Sun Oct 27 20:01:43 UTC 2024

Modified Files:
        pkgsrc/emulators/gxemul: Makefile distinfo
Added Files:
        pkgsrc/emulators/gxemul/patches:
            patch-src_include_thirdparty_bootblock.h
            patch-src_include_thirdparty_dp83932reg.h
            patch-src_include_thirdparty_pcireg.h
            patch-src_include_thirdparty_sgi__arcbios.h

Log Message:
gxemul: add patches following upstream trunk to fix build on Linux


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 pkgsrc/emulators/gxemul/Makefile
cvs rdiff -u -r1.68 -r1.69 pkgsrc/emulators/gxemul/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/gxemul/patches/patch-src_include_thirdparty_bootblock.h \
    pkgsrc/emulators/gxemul/patches/patch-src_include_thirdparty_dp83932reg.h \
    pkgsrc/emulators/gxemul/patches/patch-src_include_thirdparty_pcireg.h \
    pkgsrc/emulators/gxemul/patches/patch-src_include_thirdparty_sgi__arcbios.h

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

Modified files:

Index: pkgsrc/emulators/gxemul/Makefile
diff -u pkgsrc/emulators/gxemul/Makefile:1.75 pkgsrc/emulators/gxemul/Makefile:1.76
--- pkgsrc/emulators/gxemul/Makefile:1.75       Sun Sep  5 15:07:01 2021
+++ pkgsrc/emulators/gxemul/Makefile    Sun Oct 27 20:01:43 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2021/09/05 15:07:01 ryoon Exp $
+# $NetBSD: Makefile,v 1.76 2024/10/27 20:01:43 jakllsch Exp $
 
 DISTNAME=      gxemul-0.7.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gxemul/}
 

Index: pkgsrc/emulators/gxemul/distinfo
diff -u pkgsrc/emulators/gxemul/distinfo:1.68 pkgsrc/emulators/gxemul/distinfo:1.69
--- pkgsrc/emulators/gxemul/distinfo:1.68       Tue Oct 26 10:23:51 2021
+++ pkgsrc/emulators/gxemul/distinfo    Sun Oct 27 20:01:43 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.68 2021/10/26 10:23:51 nia Exp $
+$NetBSD: distinfo,v 1.69 2024/10/27 20:01:43 jakllsch Exp $
 
 BLAKE2s (gxemul-0.7.0.tar.gz) = b379c244d2e56b5fec53f9af66974f3ef91cca7cf3ee586d85e1a7c5ab2adbd9
 SHA512 (gxemul-0.7.0.tar.gz) = d977342843e903aedd9dcdf6fdab81ceb5ee1552bf3b90deb77eb59b42e5fad3a65f216ce33cf33259372ff9a10af5b1365827de949f0c61fb9859b417972c71
@@ -7,3 +7,7 @@ SHA1 (patch-doc_machine__cats.html) = 1c
 SHA1 (patch-src_cpus_cpu__arm.c) = c34c78a13a65b06d8a0011a8bbb27ecaed3f4db9
 SHA1 (patch-src_cpus_cpu__arm__instr.c) = b91c6b4de6f47de28db259dac6146f46d3f81787
 SHA1 (patch-src_cpus_cpu__arm__instr__dpi.c) = 160d870151cd25e5393f57acbf91525b69fa41f3
+SHA1 (patch-src_include_thirdparty_bootblock.h) = fa1c2aadbe93746201484a8140d8e2b917fce2db
+SHA1 (patch-src_include_thirdparty_dp83932reg.h) = b64223191f039ebb6b0ac4ef83f239a93ae170b1
+SHA1 (patch-src_include_thirdparty_pcireg.h) = 304767b2ca861eb6626e09b8d6af9fae56a38164
+SHA1 (patch-src_include_thirdparty_sgi__arcbios.h) = 86658fdbcde260c71d3c29c9acd6b9ac19b48be4

Added files:

Index: pkgsrc/emulators/gxemul/patches/patch-src_include_thirdparty_bootblock.h
diff -u /dev/null pkgsrc/emulators/gxemul/patches/patch-src_include_thirdparty_bootblock.h:1.1
--- /dev/null   Sun Oct 27 20:01:43 2024
+++ pkgsrc/emulators/gxemul/patches/patch-src_include_thirdparty_bootblock.h    Sun Oct 27 20:01:43 2024
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_include_thirdparty_bootblock.h,v 1.1 2024/10/27 20:01:43 jakllsch Exp $
+
+--- src/include/thirdparty/bootblock.h.orig    2024-10-27 19:48:30.289666200 +0000
++++ src/include/thirdparty/bootblock.h
+@@ -121,17 +121,6 @@
+ #ifndef _SYS_BOOTBLOCK_H
+ #define       _SYS_BOOTBLOCK_H
+ 
+-#ifdef __attribute__
+-#undef __attribute__
+-#endif
+-
+-#ifdef __noreturn__
+-#undef __noreturn__
+-#endif
+-
+-#define __attribute__(x)  /*  */
+-#define __noreturn__  /*  */
+-
+ #if !defined(__ASSEMBLER__)
+ #if defined(_KERNEL) || defined(_STANDALONE)
+ #include <sys/stdint.h>
Index: pkgsrc/emulators/gxemul/patches/patch-src_include_thirdparty_dp83932reg.h
diff -u /dev/null pkgsrc/emulators/gxemul/patches/patch-src_include_thirdparty_dp83932reg.h:1.1
--- /dev/null   Sun Oct 27 20:01:43 2024
+++ pkgsrc/emulators/gxemul/patches/patch-src_include_thirdparty_dp83932reg.h   Sun Oct 27 20:01:43 2024
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_include_thirdparty_dp83932reg.h,v 1.1 2024/10/27 20:01:43 jakllsch Exp $
+
+--- src/include/thirdparty/dp83932reg.h.orig   2024-10-27 19:48:53.211473370 +0000
++++ src/include/thirdparty/dp83932reg.h
+@@ -4,17 +4,6 @@
+ #ifndef _DEV_IC_DP83932REG_H_
+ #define       _DEV_IC_DP83932REG_H_
+ 
+-#ifdef __attribute__
+-#undef __attribute__
+-#endif
+-
+-#ifdef __noreturn__
+-#undef __noreturn__
+-#endif
+-
+-#define __attribute__(x)  /*  */
+-#define __noreturn__  /*  */
+-
+ /*-
+  * Copyright (c) 2001 The NetBSD Foundation, Inc.
+  * All rights reserved.
Index: pkgsrc/emulators/gxemul/patches/patch-src_include_thirdparty_pcireg.h
diff -u /dev/null pkgsrc/emulators/gxemul/patches/patch-src_include_thirdparty_pcireg.h:1.1
--- /dev/null   Sun Oct 27 20:01:43 2024
+++ pkgsrc/emulators/gxemul/patches/patch-src_include_thirdparty_pcireg.h       Sun Oct 27 20:01:43 2024
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_include_thirdparty_pcireg.h,v 1.1 2024/10/27 20:01:43 jakllsch Exp $
+
+--- src/include/thirdparty/pcireg.h.orig       2024-10-27 19:49:11.060880615 +0000
++++ src/include/thirdparty/pcireg.h
+@@ -4,17 +4,6 @@
+ #ifndef _DEV_PCI_PCIREG_H_
+ #define       _DEV_PCI_PCIREG_H_
+ 
+-#ifdef __attribute__
+-#undef __attribute__
+-#endif
+-
+-#ifdef __noreturn__
+-#undef __noreturn__
+-#endif
+-
+-#define __attribute__(x)  /*  */
+-#define __noreturn__  /*  */
+-
+ /*
+  * Copyright (c) 1995, 1996, 1999, 2000
+  *     Christopher G. Demetriou.  All rights reserved.
Index: pkgsrc/emulators/gxemul/patches/patch-src_include_thirdparty_sgi__arcbios.h
diff -u /dev/null pkgsrc/emulators/gxemul/patches/patch-src_include_thirdparty_sgi__arcbios.h:1.1
--- /dev/null   Sun Oct 27 20:01:43 2024
+++ pkgsrc/emulators/gxemul/patches/patch-src_include_thirdparty_sgi__arcbios.h Sun Oct 27 20:01:43 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_include_thirdparty_sgi__arcbios.h,v 1.1 2024/10/27 20:01:43 jakllsch Exp $
+
+--- src/include/thirdparty/sgi_arcbios.h.orig  2024-10-27 19:49:27.530179015 +0000
++++ src/include/thirdparty/sgi_arcbios.h
+@@ -8,12 +8,2 @@
+ 
+-#ifdef __attribute__
+-#undef __attribute__
+-#endif
+-
+-#ifdef __noreturn__
+-#undef __noreturn__
+-#endif
+-
+-#define       __attribute__(x)  /*  */
+-#define       __noreturn__  /*  */
+