VirtualBox

Changeset 79836 in vbox


Ignore:
Timestamp:
Jul 17, 2019 2:57:57 PM (5 years ago)
Author:
vboxsync
Message:

configure: use colons where needed in LD_LIBRARY_PATH.
ticketref:18722: ./configure: Spaces in LD_LIBRARY_PATH should be : (colons)
In the configure script we were passing LD_LIBRARY_PATH a space-separated
list of paths to load Qt. As there was usually only one path in the list
this did not get noticed. Fix by replacing the spaces by colons.
Thank you Lars Nordenström.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure

    r78023 r79836  
    243243}
    244244
     245L_to_PATH()
     246{
     247  echo "$1"|$KBUILD_SED 's|-L\([^ ]\+\)|\1|g; s|^-[^L][^ ]*||g; s| -[^L][^ ]*||g; s|^ ||; s| *$||g; s| |:|g'
     248}
     249
    245250strip_I()
    246251{
     
    15331538          TOOLQT5BIN=`pkg-config Qt5Core --variable=host_bins`
    15341539          if test_compile "$LIBQT5 $LIBPTHREAD $FLGQT5" qt5 qt5 nofatal; then
    1535             test_execute_path "`strip_L "$LIBQT5"`" nofatal && foundqt5=3 # pkg-config
     1540            test_execute_path "`L_to_PATH "$LIBQT5"`" nofatal && foundqt5=3 # pkg-config
    15361541          fi
    15371542        fi
     
    15511556        TOOLQT5="$q"
    15521557        if test_compile "$LIBQT5 $LIBPTHREAD $I_INCQT5 $FLGQT5" qt5 qt5 nofatal &&
    1553             test_execute_path "`strip_L "$LIBQT5"`" nofatal; then
     1558            test_execute_path "`L_to_PATH "$LIBQT5"`" nofatal; then
    15541559          foundqt5=2 # internal
    15551560          break;
     
    15571562        LIBQT5="-L$q/lib -lQt5Core"
    15581563        if test_compile "$LIBQT5 $LIBPTHREAD $I_INCQT5 $FLGQT5" qt5 qt5 nofatal &&
    1559             test_execute_path "`strip_L "$LIBQT5"`" nofatal; then
     1564            test_execute_path "`L_to_PATH "$LIBQT5"`" nofatal; then
    15601565          foundqt5=1 # no pkg-config, Qt directory
    15611566          break;
     
    15871592    [ -n "$INCQT5" ] && I_INCQT5=`prefix_I "$INCQT5"`
    15881593    if test_compile "$LIBQT5 $LIBPTHREAD $I_INCQT5 $FLGQT5" qt5 qt5 nofatal; then
    1589       if test_execute_path "`strip_L "$LIBQT5"`"; then
     1594      if test_execute_path "`L_to_PATH "$LIBQT5"`"; then
    15901595        if [ "$OS" = "darwin" ]; then
    15911596          # Successful build & run the test application so add the necessary
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