Bug 189068 - emulators/virtualbox-ose-kmod fails to build on freebsd10/i386
Summary: emulators/virtualbox-ose-kmod fails to build on freebsd10/i386
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Virtualbox Team (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-04-28 12:00 UTC by Dmitry Afanasiev
Modified: 2014-04-28 16:10 UTC (History)
0 users

See Also:

Attachments
file.diff (552 bytes, patch)
2014-04-28 12:00 UTC, Dmitry Afanasiev 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Dmitry Afanasiev 2014-04-28 12:00:00 UTC 
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.

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

Patch attached with submission follows:
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2014-04-28 12:00:08 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->vbox

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer freebsd_triage 2014-04-28 16:01:36 UTC 
Author: decke
Date: Mon Apr 28 15:01:33 2014
New Revision: 352508
URL: http://svnweb.freebsd.org/changeset/ports/352508
QAT: https://qat.redports.org/buildarchive/r352508/

Log:
  - Add undef MSR_IA32_FEATURE_CONTROL for FreeBSD 10.0/i386
  
  PR:		ports/189068
  Submitted by:	Dmitry Afanasiev <KOT@MATPOCKuH.Ru>

Modified:
  head/emulators/virtualbox-ose/files/patch-include-iprt-x86.h

Modified: head/emulators/virtualbox-ose/files/patch-include-iprt-x86.h
==============================================================================
--- head/emulators/virtualbox-ose/files/patch-include-iprt-x86.h	Mon Apr 28 14:38:51 2014	(r352507)
+++ head/emulators/virtualbox-ose/files/patch-include-iprt-x86.h	Mon Apr 28 15:01:33 2014	(r352508)
@@ -1,6 +1,6 @@
 --- 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,15 @@
+@@ -35,6 +35,16 @@
  # pragma D depends_on library vbox-types.d
  #endif
  
@@ -11,6 +11,7 @@
 +# 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 */
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Bernhard Froehlich freebsd_committer freebsd_triage 2014-04-28 16:01:59 UTC 
State Changed
From-To: open->closed

Committed. Thanks!