Changeset 109242 in vbox

Timestamp:

May 13, 2025 3:04:31 PM (6 days ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

168829

Message:

packaging: rpm: Adjust to OpenSuse 15.6 (build fix).

File:

• trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec (modified) (4 diffs)

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -140 +140 @@
 # For openSUSE156 we need GCC 10+ to build Qt 6.8 related code. However,
 # kernel modules need be built with older GCC.
-OLD_CC="$CC"
-export CC=gcc-7
+VBOX_EXTRA_FLAGS="CC=gcc-7"
 %endif
 for d in /lib/modules/*; do
@@ -149 +148 @@
       --save-module-symvers /tmp/vboxdrv-Module.symvers \
       --module-source `pwd`/src/vboxhost/vboxdrv \
-      KBUILD_VERBOSE= KERN_VER=$(basename $d) INSTALL_MODULE_PATH=$RPM_BUILD_ROOT CC="$CC" -j4 \
+      KBUILD_VERBOSE= KERN_VER=$(basename $d) INSTALL_MODULE_PATH=$RPM_BUILD_ROOT $VBOX_EXTRA_FLAGS -j4 \
       %INSTMOD%
     ./src/vboxhost/build_in_tmp \
       --use-module-symvers /tmp/vboxdrv-Module.symvers \
       --module-source `pwd`/src/vboxhost/vboxnetflt \
-      KBUILD_VERBOSE= KERN_VER=$(basename $d) INSTALL_MODULE_PATH=$RPM_BUILD_ROOT CC="$CC" -j4 \
+      KBUILD_VERBOSE= KERN_VER=$(basename $d) INSTALL_MODULE_PATH=$RPM_BUILD_ROOT $VBOX_EXTRA_FLAGS -j4 \
       %INSTMOD%
     ./src/vboxhost/build_in_tmp \
       --use-module-symvers /tmp/vboxdrv-Module.symvers \
       --module-source `pwd`/src/vboxhost/vboxnetadp \
-      KBUILD_VERBOSE= KERN_VER=$(basename $d) INSTALL_MODULE_PATH=$RPM_BUILD_ROOT CC="$CC" -j4 \
+      KBUILD_VERBOSE= KERN_VER=$(basename $d) INSTALL_MODULE_PATH=$RPM_BUILD_ROOT $VBOX_EXTRA_FLAGS -j4 \
       %INSTMOD%
     if [ -e `pwd`/src/vboxhost/vboxpci ]; then
@@ -165 +164 @@
         --use-module-symvers /tmp/vboxdrv-Module.symvers \
         --module-source `pwd`/src/vboxhost/vboxpci \
-        KBUILD_VERBOSE= KERN_VER=$(basename $d) INSTALL_MODULE_PATH=$RPM_BUILD_ROOT CC="$CC" -j4 \
+        KBUILD_VERBOSE= KERN_VER=$(basename $d) INSTALL_MODULE_PATH=$RPM_BUILD_ROOT $VBOX_EXTRA_FLAGS -j4 \
         %INSTMOD%
     fi
@@ -176 +175 @@
 %endif
 %if "%BUILDREL%" == "openSUSE156"
-export CC="$OLD_CC"
-unset OLD_CC
+unset VBOX_EXTRA_FLAGS
 %endif
 rm -r src