diff options
| author | jkim <jkim@FreeBSD.org> | 2018-07-12 00:15:31 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2018-07-12 00:15:31 +0800 |
| commit | 4560b8c50c99041dce26798a7c1bd1498defe0e7 (patch) | |
| tree | ae8dbb8919b2ee7ed95751e316bc4cc0198d15a2 /emulators/virtualbox-ose | |
| parent | d63372a356b5a78048931ce9fe1cddc8fb31a5a1 (diff) | |
| download | freebsd-ports-gnome-4560b8c50c99041dce26798a7c1bd1498defe0e7.tar.gz freebsd-ports-gnome-4560b8c50c99041dce26798a7c1bd1498defe0e7.tar.zst freebsd-ports-gnome-4560b8c50c99041dce26798a7c1bd1498defe0e7.zip | |
Unbreak emulators/virtualbox-ose-additions and emulators/virtualbox-ose-kmod
on head after r335879.
Diffstat (limited to 'emulators/virtualbox-ose')
| -rw-r--r-- | emulators/virtualbox-ose/files/patch-include_iprt_string.h | 14 | ||||
| -rw-r--r-- | emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h | 9 |
2 files changed, 17 insertions, 6 deletions
diff --git a/emulators/virtualbox-ose/files/patch-include_iprt_string.h b/emulators/virtualbox-ose/files/patch-include_iprt_string.h new file mode 100644 index 000000000000..d2792545c97e --- /dev/null +++ b/emulators/virtualbox-ose/files/patch-include_iprt_string.h @@ -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) diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h index 24a900ce5f8e..09bb8575898e 100644 --- a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h +++ b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h @@ -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 { \ |