VirtualBox

Changeset 90355 in vbox for trunk


Ignore:
Timestamp:
Jul 27, 2021 1:40:44 PM (3 years ago)
Author:
vboxsync
Message:

configure: Use $DEVDIR to refer to the tools directory consistently. Make sure that Qt5 is actually operational (on old EL7 there is Qt 5.6 but the GUI part of it has linking errors) before deciding to use it.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure

    r90354 r90355  
    567567
    568568  if [ -z "$WATCOM" ]; then
    569     WATCOM=`/bin/ls -rd1 $PWD/tools/common/openwatcom/* 2> /dev/null | head -1`
     569    WATCOM=`/bin/ls -rd1 $DEVDIR/common/openwatcom/* 2> /dev/null | head -1`
    570570    if [ -z "$WATCOM" ]; then
    571571      if [ $OSE -eq 0 -a $OS = "linux" ]; then
     
    15481548    # First check if there is the internal version of Qt. If yes nothing else
    15491549    # has to be done.
    1550     QT_INTERNAL=`/bin/ls -rd1 $PWD/tools/$BUILD_TARGET.$BUILD_PLATFORM_ARCH/qt/* 2> /dev/null`
     1550    QT_INTERNAL=`/bin/ls -rd1 $DEVDIR/$BUILD_TARGET.$BUILD_PLATFORM_ARCH/qt/* 2> /dev/null`
    15511551    for t in $QT_INTERNAL; do
    15521552      if [ -f "$t/Frameworks/QtCoreVBox.framework/QtCoreVBox" ]; then
     
    15881588        if [ $? -eq 0 ]; then
    15891589          echo "(Qt5 from pkg-config)" >> $LOG
    1590           FLGQT5=`pkg-config Qt5Core --cflags`
     1590          FLGQT5=`pkg-config Qt5Core Qt5Gui --cflags`
    15911591          # gcc 4.8 is able to compile with C++11 (see also VBOX_GCC_std in Config.kmk)
    15921592          [ $(($cc_maj * 100 + $cc_min)) -ge 408 ] && FLGQT5="$FLGQT5 -std=c++11"
    15931593          INCQT5=`strip_I "$FLGQT5"`
    15941594          LIBDIR5=`pkg-config Qt5Core --variable=libdir`
    1595           LIBQT5=`pkg-config Qt5Core --libs`
     1595          LIBQT5=`pkg-config Qt5Core Qt5Gui --libs`
    15961596          LIBQT5="-L$LIBDIR5 $LIBQT5"
    15971597          TOOLQT5=`pkg-config Qt5Core --variable=prefix`
     
    16081608    if [ -z "$foundqt5" ]; then
    16091609      # Do it the old way (e.g. user has specified QT5DIR):
    1610       for q in $QT5DIR "$PWD/tools/linux.$TARGET_MACHINE"/qt/v5.*; do
     1610      for q in $QT5DIR "$DEVDIR/linux.$TARGET_MACHINE"/qt/v5.*; do
    16111611        echo "(Qt5 from '$q')" >> $LOG
    16121612        INCQT5="$q/include $q/include/QtCore"
    16131613        FLGQT5="-DQT_SHARED -std=c++11"
    16141614        I_INCQT5=`prefix_I "$INCQT5"`
    1615         LIBQT5="-L$q/lib -lQt5CoreVBox"
     1615        LIBQT5="-L$q/lib -lQt5CoreVBox -lQt5GuiVBox"
    16161616        TOOLQT5="$q"
    16171617        if test_compile "$LIBQT5 $LIBPTHREAD $I_INCQT5 $FLGQT5" qt5 qt5 nofatal &&
     
    16201620          break;
    16211621        fi
    1622         LIBQT5="-L$q/lib -lQt5Core"
     1622        LIBQT5="-L$q/lib -lQt5Core lQt5Gui"
    16231623        if test_compile "$LIBQT5 $LIBPTHREAD $I_INCQT5 $FLGQT5" qt5 qt5 nofatal &&
    16241624            test_execute_path "`L_to_PATH "$LIBQT5"`" nofatal; then
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