Changeset 66821 in vbox

Timestamp:

May 8, 2017 4:31:32 PM (8 years ago)

Author:

vboxsync

Message:

configure/debian: by default stay with Qt requirement 5.3.2 but when building the Debian packages depend on Qt 5.6 or later

Location:

trunk

Files:

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

trunk/configure

@@ -159 +159 @@
 QT5DIR="/usr/lib/qt5 /usr/share/qt5 /usr/lib64/qt5 /usr /usr/local"
 QT5DIR_PKGCONFIG=1
+QT5MAJ=5
+QT5MIN=3
 KBUILDDIR="`cd \`dirname $0\`; pwd`/kBuild"
 DEVDIR="`cd \`dirname $0\`; pwd`/tools"
@@ -1648 +1650 @@
 extern "C" int main(void)
 {
-#if QT_VERSION >= 0x050302
+EOF
+  echo "#if QT_VERSION >= $(($QT5MAJ*65536+$QT5MIN*256))" >> $ODIR.tmp_src.cc
+  cat >> $ODIR.tmp_src.cc << EOF
   return 0;
 #else
@@ -1740 +1744 @@
 {
   printf("found version %s", QT_VERSION_STR);
-#if QT_VERSION >= 0x050302
+EOF
+  echo "#if QT_VERSION >= $(($QT5MAJ*65536+$QT5MIN*256))" >> $ODIR.tmp_src.cc
+    cat >> $ODIR.tmp_src.cc << EOF
   printf(", OK.\n");
   return 0;
 #else
-  printf(", expected version 5.3.2 or higher\n");
+EOF
+echo "  printf(\", expected version $QT5MAJ.$QT5MIN or higher\\\\n\");" >> $ODIR.tmp_src.cc
+    cat >> $ODIR.tmp_src.cc << EOF
   return 1;
 #endif
@@ -2623 +2631 @@
       [ $WITH_QT5 -eq 1 ] && QT5DIR_PKGCONFIG=0
       ;;
+    --with-qt5-minor=*)
+      QT5MIN=`echo $option | cut -d'=' -f2`
+      ;;
+    --with-qt5-major=*)
+      QT5MAJ=`echo $option | cut -d'=' -f2`
+      ;;
     --with-openssl-dir=*)
       OPENSSLDIR=`echo $option | cut -d'=' -f2`

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

@@ -95 +95 @@
 endif
 
+# Depend on Qt 5.6 or later otherwise we use Qt 5.3.2 from Debian 8.
 cfg_flags := $(if $(NOQT),--disable-qt,) \
+             $(if $(NOQT),,--with-qt5-major=5 --with-qt-minor=6) \
              $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
              $(if $(HEADLESS),--build-headless,) \