VirtualBox

Changeset 41036 in vbox for trunk/src/VBox/Installer


Ignore:
Timestamp:
Apr 24, 2012 7:55:07 AM (13 years ago)
Author:
vboxsync
Message:

deb/rpm: use self-compiled libQt4 for older Linux distributions as we now depend on Qt 4.6.2 or newer

Location:
trunk/src/VBox/Installer/linux
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Installer/linux/debian/LocalConfig.kmk

    r40217 r41036  
    3030VBOX_PATH_APP_PRIVATE      := /usr/share/virtualbox
    3131VBOX_PATH_APP_DOCS          = $(VBOX_PATH_PACKAGE_DOCS)
    32 
  • trunk/src/VBox/Installer/linux/debian/rules

    r40390 r41036  
    9595
    9696cfg_flags := $(if $(NOQT),--disable-qt,) \
    97              $(if $(filter _Ubuntu_hardy,$(debrel)),--with-qt4-dir=$(qtstdc6)) \
     97             $(if $(filter _Ubuntu_hardy _Debian_lenny,$(debrel)),--with-qt4-dir=$(qtstdc6)) \
    9898             $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
    9999             $(if $(HEADLESS),--build-headless,) \
  • trunk/src/VBox/Installer/linux/rpm/rules

    r40660 r41036  
    136136             $(if $(filter sles10.1 turbolinux11,$(rpmrel)),--disable-pulse,) \
    137137             $(if $(filter rhel4 rhel5 ol4 ol5 centos4 centos5,$(rpmrel)),--enable-pulse,) \
    138              $(if $(filter rhel4 rhel5 ol4 ol5 centos4 centos5 sles10.1 turbolinux11,$(rpmrel)),--with-qt4-dir=/home/vbox/Qt-4.7.4-stdc++6-$(arch)) \
     138             $(if $(filter rhel4 rhel5 ol4 ol5 centos4 centos5 mdv2010.0-amd64 sles10.1 sles11.0 turbolinux11,$(rpmrel)),--with-qt4-dir=/home/vbox/Qt-4.7.4-stdc++6-$(arch)) \
    139139             $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
    140140             $(if $(HEADLESS),--build-headless,) \
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette