ports/189068: emulators/virtualbox-ose-kmod fails to build on freebsd10/i386

[Dmitry Afanasiev]

>Number:         189068
>Category:       ports
>Synopsis:       emulators/virtualbox-ose-kmod fails to build on freebsd10/i386
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 28 11:00:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry Afanasiev
>Release:        10.0-STABLE
>Organization:
>Environment:
FreeBSD meow 10.0-STABLE FreeBSD 10.0-STABLE #5 r264761: Wed Apr 23 21:55:28 MSK 2014     root at meow:/usr/obj/usr/src/sys/meow  i386
>Description:
The problem, reported by me in ports/183739, was not fully fixed.
Building virtualbox-ose-kmod-4.3.10 now fails with:
--- SUPDrv.o ---
In file included from SUPDrv.c:57:
include/iprt/x86.h:967:1: error: "MSR_IA32_FEATURE_CONTROL" redefined
In file included from ./machine/specialreg.h:6,
                 from ./machine/atomic.h:37,
                 from @/sys/systm.h:41,
                 from @/sys/libkern.h:39,
                 from include/iprt/string.h:67,
                 from SUPDrvInternal.h:43,
                 from SUPDrv.c:32:
./x86/specialreg.h:354:1: error: this is the location of the previous definition

As I know, problem affects only FreeBSD10 on i386.
>How-To-Repeat:

>Fix:
Correct emulators/virtualbox-ose/files/patch-include-iprt-x86.h attached

Patch attached with submission follows:

--- include/iprt/x86.h.orig	2014-02-25 11:59:50.000000000 -0500
+++ include/iprt/x86.h	2014-03-11 16:46:08.000000000 -0400
@@ -35,6 +35,16 @@
 # pragma D depends_on library vbox-types.d
 #endif
 
+/* Workaround for FreeBSD machine/specialreg.h defining MSRs */
+#ifdef RT_OS_FREEBSD
+# undef MSR_P5_MC_ADDR
+# undef MSR_P5_MC_TYPE
+# undef MSR_IA32_PLATFORM_ID
+# undef MSR_BBL_CR_CTL3
+# undef MSR_IA32_MISC_ENABLE
+# undef MSR_IA32_FEATURE_CONTROL
+#endif
+
 /* Workaround for Solaris sys/regset.h defining CS, DS */
 #ifdef RT_OS_SOLARIS
 # undef CS


>Release-Note:
>Audit-Trail:
>Unformatted: