- fix build on i686

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 649780d3fdf9c195b361c3afe0fae389d42ced11..579e6f0f27bb83bd88b1d4709be145e60f29ced3 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -90,6 +90,7 @@ Patch18:      qt-detect.patch
 Patch19:       python3.patch
 Patch20:       gcc-13.patch
 Patch21:       xsl-style-dir.patch
+Patch22:       build-arch.patch
 URL:           http://www.virtualbox.org/
 %if %{with userspace}
 %ifarch %{x8664}
@@ -562,6 +563,7 @@ echo override vboxsf %{_kernel_ver} misc >> kernel/installed/etc/depmod.d/%{_ker
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
        -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
@@ -611,6 +613,8 @@ TOOL_GCC3_CFLAGS=%{rpmcflags}
 TOOL_GCC3_CXXFLAGS=%{rpmcxxflags}
 VBOX_GCC_OPT=%{rpmcxxflags}
 
+TOOL_YASM_AS := /usr/bin/yasm
+
 VBOX_PATH_APP_PRIVATE_ARCH := %{_libdir}/%{pname}
 VBOX_PATH_APP_PRIVATE := %{_datadir}/%{pname}
 VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
@@ -625,7 +629,10 @@ VBOX_WITH_TESTSUITE :=
 
 VBOX_WITH_VRDP_RDESKTOP=
 VBOX_WITH_MULTIVERSION_PYTHON=0
-%{!?with_host:VBOX_ONLY_ADDITIONS_WITHOUT_RTISOMAKER=1}
+%if %{without host}
+VBOX_ONLY_ADDITIONS_WITHOUT_RTISOMAKER=1
+VBOX_ONLY_ADDITIONS=1
+%endif
 EOF
 
 %undefine      filterout_c
@@ -647,7 +654,7 @@ EOF
        %{nil}
 
 . "$PWD/env.sh"
-kmk %{?_smp_mflags}
+kmk %{?_smp_mflags} %{!?with_host:VBOX_ONLY_ADDITIONS_WITHOUT_RTISOMAKER=1 VBOX_ONLY_ADDITIONS=1}
 %endif
 
 %{?with_kernel:%{expand:%build_kernel_packages}}

diff --git a/build-arch.patch b/build-arch.patch
new file mode 100644 (file)
index 0000000..504bee2
--- /dev/null
+++ b/build-arch.patch
@@ -0,0 +1,11 @@
+--- VirtualBox-7.0.10/configure.orig   2023-09-07 02:11:31.000000000 +0200
++++ VirtualBox-7.0.10/configure        2023-09-07 02:20:09.875202421 +0200
+@@ -381,7 +381,7 @@
+ check_environment()
+ {
+   test_header environment
+-  BUILD_CPU=`uname -m`
++  BUILD_CPU=`rpm -E '%{_host_cpu}'`
+   [ "$OS" = "solaris" ] && BUILD_CPU=`isainfo | cut -f 1 -d ' '`
+   case "$BUILD_CPU" in
+     i[3456789]86|x86|i86pc|BePC)