Changeset 67996 in vbox

Timestamp:

Jul 17, 2017 1:07:39 PM (7 years ago)

Author:

vboxsync

Message:

deb/rpm: enable multiple python modules

Location:

trunk

Files:

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

trunk/debian/rules

@@ -80 +80 @@
              $(if $(filter _Debian_squeeze _Ubuntu_lucid,$(debrel)),,VBOX_WITH_VMSVGA3D=1) \
              VBOX_DO_STRIP= \
-             VBOX_WITH_MULTIVERSION_PYTHON= \
              VBOX_PATH_PACKAGE_DOCS="\"/usr/share/doc/$(verpkg)\"" \
              $(if $(ose),,VBOX_WITH_DOCS_CHM=1) \

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

@@ -111 +111 @@
              VBOX_WITH_VMSVGA3D=1 \
              VBOX_DO_STRIP= \
-             VBOX_WITH_MULTIVERSION_PYTHON= \
              VBOX_PATH_PACKAGE_DOCS="\"/usr/share/doc/$(verpkg)\"" \
              $(if $(ose),,VBOX_WITH_DOCS_CHM=1) \

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

@@ -106 +106 @@
  endif
 
- ifeq ($(filter-out el5 el6 el7 fedora18 fedora19 fedora20 fedora21 fedora22 fedora24 fedora25,$(rpmrel)),)
+ ifeq ($(filter-out el5 el6 el7 fedora18 fedora19 fedora20 fedora21 fedora22 fedora24 fedora25 fedora26,$(rpmrel)),)
   rpmspec := rpm_redhat
  endif
@@ -168 +168 @@
              $(if $(filter el5,$(rpmrel)),VBOX_BLD_PYTHON=$(strip \
                 $(firstword $(wildcard /usr/local/bin/python2.7) $(wildcard /usr/bin/python))),) \
-             VBOX_WITH_MULTIVERSION_PYTHON= \
              $(doc_dir) \
              $(if $(ose),,VBOX_WITH_DOCS_CHM=1) \