CVS commit: pkgsrc/emulators/bochs

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Mon Jan 21 10:04:45 UTC 2019

Modified Files:
        pkgsrc/emulators/bochs: Makefile distinfo
Added Files:
        pkgsrc/emulators/bochs: PLIST.Linux
        pkgsrc/emulators/bochs/patches: patch-configure
            patch-iodev_network_slirp_slirp.h

Log Message:
bochs: fix build on linux


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 pkgsrc/emulators/bochs/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/bochs/PLIST.Linux
cvs rdiff -u -r1.32 -r1.33 pkgsrc/emulators/bochs/distinfo
cvs rdiff -u -r0 -r1.6 pkgsrc/emulators/bochs/patches/patch-configure
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/bochs/patches/patch-iodev_network_slirp_slirp.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/bochs/Makefile
diff -u pkgsrc/emulators/bochs/Makefile:1.93 pkgsrc/emulators/bochs/Makefile:1.94
--- pkgsrc/emulators/bochs/Makefile:1.93        Sun Jan 13 11:59:37 2019
+++ pkgsrc/emulators/bochs/Makefile     Mon Jan 21 10:04:45 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2019/01/13 11:59:37 ryoon Exp $
+# $NetBSD: Makefile,v 1.94 2019/01/21 10:04:45 markd Exp $
 
 DISTNAME=              bochs-2.6.9
 CATEGORIES=            emulators
@@ -94,6 +94,13 @@ CONFIGURE_ARGS+=     --with-term
 PLIST.x11=             yes
 .endif
 
+.if ${OPSYS} == "Linux"
+SUBST_CLASSES+=                nobpf
+SUBST_FILES.nobpf=     config.h
+SUBST_SED.nobpf=       -e 's:BX_NETMOD_FBSD 1:BX_NETMOD_FBSD 0:'
+SUBST_STAGE.nobpf=     post-configure
+.endif
+
 OPSYSVARS+=            BOCHSRC_SUBST
 BOCHSRC_SUBST.Linux+=  -e 's,@FLOPPY_BSD@,\#,'
 BOCHSRC_SUBST.Linux+=  -e 's,@FLOPPY_LINUX@,,'

Index: pkgsrc/emulators/bochs/distinfo
diff -u pkgsrc/emulators/bochs/distinfo:1.32 pkgsrc/emulators/bochs/distinfo:1.33
--- pkgsrc/emulators/bochs/distinfo:1.32        Sun Jan 13 11:59:38 2019
+++ pkgsrc/emulators/bochs/distinfo     Mon Jan 21 10:04:45 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2019/01/13 11:59:38 ryoon Exp $
+$NetBSD: distinfo,v 1.33 2019/01/21 10:04:45 markd Exp $
 
 SHA1 (bochs-2.6.9.tar.gz) = 1aec18479c33d9abc7a43c0fbd744eb86199c55d
 RMD160 (bochs-2.6.9.tar.gz) = d437bbaa04b8bb9f3b42a51860459dcc4e308616
@@ -6,7 +6,9 @@ SHA512 (bochs-2.6.9.tar.gz) = dfecf3a1ba
 Size (bochs-2.6.9.tar.gz) = 5169187 bytes
 SHA1 (patch-.bochsrc) = df5b8879ec005fe44bca8bee42c549095012013d
 SHA1 (patch-Makefile.in) = ca8d485a9f4901df15eb3e521105de2ae833cfcb
+SHA1 (patch-configure) = 3c8de4efa55dac9f672ad087e35dd7512ae5db8e
 SHA1 (patch-iodev_network_eth__socket.cc) = 37c4ab50da3f646ffc541001e8a8b7c93a7995c4
 SHA1 (patch-iodev_network_slirp_compat_cc) = a48d112daac6049c0ee8076eb012ab2f44740889
+SHA1 (patch-iodev_network_slirp_slirp.h) = c0920978ca5f004be603950240e4a988bee6d4f9
 SHA1 (patch-iodev_sound_soundosx.cc) = 7dacc7df74e64d3df72a241a291f434f72722cec
 SHA1 (patch-main.cc) = 77296af5e8101c7c9ded37ec77571dbc61f98e4b

Added files:

Index: pkgsrc/emulators/bochs/PLIST.Linux
diff -u /dev/null pkgsrc/emulators/bochs/PLIST.Linux:1.1
--- /dev/null   Mon Jan 21 10:04:45 2019
+++ pkgsrc/emulators/bochs/PLIST.Linux  Mon Jan 21 10:04:45 2019
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.Linux,v 1.1 2019/01/21 10:04:45 markd Exp $
+lib/bochs/plugins/libbx_eth_linux.la
+lib/bochs/plugins/libbx_pcidev.la

Index: pkgsrc/emulators/bochs/patches/patch-configure
diff -u /dev/null pkgsrc/emulators/bochs/patches/patch-configure:1.6
--- /dev/null   Mon Jan 21 10:04:45 2019
+++ pkgsrc/emulators/bochs/patches/patch-configure      Mon Jan 21 10:04:45 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.6 2019/01/21 10:04:45 markd Exp $
+
+Deal with Linux 4.x
+
+--- configure.orig     2015-05-03 06:37:18.754341000 +0000
++++ configure
+@@ -23311,7 +23311,7 @@ $as_echo "$as_me: Linux detected as host
+               PCIDEV_MODULE_MAKE_ALL="all-kernel24"
+               KERNEL_MODULE_SUFFIX="o"
+               ;;
+-            2.6*|3.*)
++            2.6*|3.*|4.*)
+               PCIDEV_MODULE_MAKE_ALL="all-kernel26"
+               KERNEL_MODULE_SUFFIX="ko"
+               ;;

Index: pkgsrc/emulators/bochs/patches/patch-iodev_network_slirp_slirp.h
diff -u /dev/null pkgsrc/emulators/bochs/patches/patch-iodev_network_slirp_slirp.h:1.1
--- /dev/null   Mon Jan 21 10:04:45 2019
+++ pkgsrc/emulators/bochs/patches/patch-iodev_network_slirp_slirp.h    Mon Jan 21 10:04:45 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-iodev_network_slirp_slirp.h,v 1.1 2019/01/21 10:04:45 markd Exp $
+
+uintptr_t not declared on linux without this
+
+--- iodev/network/slirp/slirp.h.orig   2014-12-25 17:58:26.557466000 +0000
++++ iodev/network/slirp/slirp.h
+@@ -33,7 +33,7 @@ typedef char *caddr_t;
+ #endif
+ 
+ #include <sys/types.h>
+-#if defined(__OpenBSD__)
++#if defined(__OpenBSD__) || defined(__linux__)
+ #include <stdint.h>
+ #include <sys/wait.h>
+ #endif