Changeset 57804 in vbox

Timestamp:

Sep 17, 2015 11:11:13 AM (9 years ago)

Author:

vboxsync

Message:

Installer/linux: RPM build consistency fixes.

File:

• trunk/src/VBox/Installer/linux/rpm/rules (modified) (2 diffs)

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

@@ -159 +159 @@
              $(if $(filter el5 ol5 centos5 el6 ol6 centos6 sles10.1 sles11.0 mdv2011.0,$(rpmrel)),--build-libvpx,) \
              $(if $(filter el5 ol5 centos5 sles10.1 sles11.0,$(rpmrel)),--build-libcurl,) \
-             $(if $(filter el5 centos5 sles10.1,$(rpmrel)),--disable-sdl-ttf,) \
+             $(if $(filter el5 ol5 centos5 sles10.1,$(rpmrel)),--disable-sdl-ttf,) \
              $(if $(filter el5 ol5 centos5 sles10.1,$(rpmrel)),--disable-pulse,) \
              $(if $(filter el5 ol5 centos5 el6 ol6 centos6 sles10.1 sles11.0,$(rpmrel)),--with-qt4-dir=/home/vbox/Qt-4.8.6-stdc++6-$(arch)) \
@@ -175 +175 @@
              VBOX_WITHOUT_EXTPACK_PUEL_PACKING=1 \
              VBOX_WITHOUT_EXTPACK_VNC_PACKING=1 \
-             $(if $(filter el5 el6 sles10.1 sles11.0,$(rpmrel)),,VBOX_WITH_VMSVGA3D=1) \
+             $(if $(filter el5 ol5 centos5 el6 ol6 centos6 sles10.1 sles11.0,$(rpmrel)),,VBOX_WITH_VMSVGA3D=1) \
              VBOX_DO_STRIP= \
              VBOX_WITH_MULTIVERSION_PYTHON= \