cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r474458

Browse Source 
Unbreak emulators/virtualbox-ose-additions and emulators/virtualbox-ose-kmod
on head after r335879.

Approved by:	ports-secteam (blanket)
This commit is contained in:
Jung-uk Kim 2018-07-11 16:24:25 +00:00
parent 8405696c29
commit 7088c424ea
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2018Q3/; revision=474461
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
emulators/virtualbox-ose/files/patch-include_iprt_string.h Normal file
View File

@ -0,0 +1,14 @@
--- include/iprt/string.h.orig 2018-06-29 13:08:03 UTC
+++ include/iprt/string.h
@@ -43,6 +43,11 @@
#elif defined(RT_OS_FREEBSD) && defined(_KERNEL)
RT_C_DECLS_BEGIN
# include <sys/libkern.h>
+ /*
+ * Kludge for the FreeBSD kernel:
+ * sys/libkern.h includes sys/param.h via sys/systm.h since r335879.
+ */
+# undef PVM
RT_C_DECLS_END
#elif defined(RT_OS_NETBSD) && defined(_KERNEL)

9
emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h
View File

@ -1,4 +1,4 @@
--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h.orig 2017-10-18 07:06:47 UTC
--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h.orig 2018-06-29 13:08:17 UTC
+++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h
@@ -1,8 +1,3 @@
-/* $Id: vboxvfs.h $ */
@ -7,9 +7,9 @@
- */
-
/*
* Copyright (C) 2010-2016 Oracle Corporation
* Copyright (C) 2010-2017 Oracle Corporation
*
@@ -21,72 +16,416 @@
@@ -21,72 +16,413 @@
#define VBOXVFS_VFSNAME "vboxvfs"
#define VBOXVFS_VERSION 1
@ -174,9 +174,6 @@
- long nextino;
- int caseopt;
- int didrele;
+#if defined(RT_OS_FREEBSD) && defined(_KERNEL)
+# undef PVM /** XXX: For not conflict with PVM in sys/priority.h */
+#endif
+#include <VBox/VBoxGuestLibSharedFolders.h>
+
+#define VBOXVFS_DEBUG(lvl, ...) do { \