Changeset 63555 in vbox

Timestamp:

Aug 16, 2016 1:25:08 PM (8 years ago)

Author:

vboxsync

Message:

deb: fixes

Location:

trunk

Files:

• debian/rules (modified) (1 diff)
• src/VBox/Installer/linux/debian/rules (modified) (3 diffs)

trunk/debian/rules

@@ -68 +68 @@
 instmod := $(if $(filter _Ubuntu_lucid _Ubuntu_maverick _Ubuntu_natty _Ubuntu_oneiric _Debian_sid,$(debrel)),,1)
 
-# Location of custom built Qt libraries (see below)
-qtstdc6  := /home/vbox/Qt-4.8.6-stdc++6-$(arch)
-
 cfg_flags := $(if $(NOQT),--disable-qt,) \
-             $(if $(filter _Debian_squeeze,$(debrel)),--with-qt-dir=$(qtstdc6)) \
-             $(if $(filter _Debian_squeeze,$(debrel)),--build-libvpx,) \
              $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
              $(if $(HEADLESS),--build-headless,) \

trunk/src/VBox/Installer/linux/debian/rules

@@ -97 +97 @@
 endif
 
-# Location of custom built Qt libraries (see below)
-qtstdc6  := /home/vbox/Qt-4.8.6-stdc++6-$(arch)
-
 cfg_flags := $(if $(NOQT),--disable-qt,) \
-             $(if $(filter _Debian_squeeze,$(debrel)),--with-qt-dir=$(qtstdc6)) \
-             $(if $(filter _Debian_squeeze,$(debrel)),--build-libvpx,) \
              $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
              $(if $(HEADLESS),--build-headless,) \
@@ -116 +111 @@
              VBOX_WITHOUT_EXTPACK_PUEL_PACKING=1 \
              VBOX_WITHOUT_EXTPACK_VNC_PACKING=1 \
-             $(if $(filter _Debian_squeeze _Ubuntu_lucid,$(debrel)),,VBOX_WITH_VMSVGA3D=1) \
+             VBOX_WITH_VMSVGA3D=1 \
              VBOX_DO_STRIP= \
              VBOX_WITH_MULTIVERSION_PYTHON= \
@@ -287 +282 @@
                 --keepgoing --replace /usr/lib/$(package) \
                 $(prefix)/usr/lib/$(package)/*.so.5 \
-                $(prefix)/usr/lib/$(package)/plugins/platforms/*.so \
+                $(prefix)/usr/lib/$(package)/plugins/platforms/*.so; \
             echo "[Paths]" > $(prefix)/usr/lib/$(package)/qt.conf; \
             echo "Plugins = /usr/lib/$(package)/plugins" >> $(prefix)/usr/lib/$(package)/qt.conf; \