Changeset 90368 in vbox for trunk/src/VBox/Installer/linux

Timestamp:

Jul 28, 2021 1:30:11 PM (3 years ago)

Author:

vboxsync

Message:

Installer/linux/rpm/VirtualBox.tmpl.spec: Use the right expansion for substring processing. It's a prefix.

rpm/rules: Avoid adding the special gcc location for EL7 to PATH more than once.

Location:

trunk/src/VBox/Installer/linux/rpm

Files:

• VirtualBox.tmpl.spec (modified) (1 diff)
• rules (modified) (1 diff)

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

@@ -124 +124 @@
 %if "%BUILDREL%" == "el7"
 # For el7 we use gcc from devtoolset-4, which is not suitable for kernel work.
+# See the PATH trickery in src/VBox/Installer/linux/rpm/rules.
 old_path="$PATH"
-PATH=${PATH%/opt/rh/devtoolset-4/root/bin:}
-PATH=${PATH%/opt/rh/devtoolset-4/root/usr/bin:}
+PATH=${PATH#/opt/rh/devtoolset-4/root/usr/bin:}
 %endif
 for d in /lib/modules/*; do

trunk/src/VBox/Installer/linux/rpm/rules

@@ -150 +150 @@
 ifeq ($(NOQT),)
  ifeq ($(rpmrel),el7)
+  # Protect against the fact that this Makefile is run several times, updating
+  # PATH every time. Still assumes that nothing else is added as a prefix.
+  PATH := $(PATH:/opt/rh/devtoolset-4/root/usr/bin:%=%)
   export PATH := /opt/rh/devtoolset-4/root/usr/bin:$(PATH)
  endif