- force symbol into .rodata (as is on x86) to avoid confusing vbox makefile rules

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 3dc0505bb46eb6fef40e752826ff06ab6588c72b..f58b951d5c8abf83f8bc9e8e49bd804ef69e54a3 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -94,6 +94,7 @@ Patch8:               lightdm-greeter-g++-link.patch
 Patch9:                pld-guest.patch
 Patch10:       16-no-update.patch
 Patch11:       18-system-xorg.patch
+Patch12:       x8664-build.patch
 URL:           http://www.virtualbox.org/
 %if %{with userspace}
 %ifarch %{x8664}
@@ -540,6 +541,7 @@ cd ../..\
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
        -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in

diff --git a/x8664-build.patch b/x8664-build.patch
new file mode 100644 (file)
index 0000000..70382fb
--- /dev/null
+++ b/x8664-build.patch
@@ -0,0 +1,11 @@
+--- a/src/VBox/Runtime/common/ldr/ldrkStuff.cpp        2014-07-20 17:50:52.918200154 +0200
++++ b/src/VBox/Runtime/common/ldr/ldrkStuff.cpp        2014-07-20 22:59:50.360692743 +0200
+@@ -368,7 +368,7 @@
+  * We provide our own based on IPRT instead of using the kLdr ones.
+  */
+ extern "C" const KRDROPS g_kLdrRdrFileOps;
+-extern "C" const KRDROPS g_kLdrRdrFileOps =
++const KRDROPS g_kLdrRdrFileOps __attribute__((section(".rodata"))) =
+ {
+     /* .pszName = */        "IPRT",
+     /* .pNext = */          NULL,