vbox的更動 79836 路徑 trunk/configure

時間撮記:

2019-7-17 下午02:57:57 (5 年 以前)

作者:

vboxsync

訊息:

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.

檔案:

• trunk/configure (修改) (5 筆差異)

trunk/configure

@@ -243 +243 @@
 }
 
+L_to_PATH()
+{
+  echo "$1"|$KBUILD_SED 's|-L\([^ ]\+\)|\1|g; s|^-[^L][^ ]*||g; s| -[^L][^ ]*||g; s|^ ||; s| *$||g; s| |:|g'
+}
+
 strip_I()
 {
@@ -1533 +1538 @@
           TOOLQT5BIN=`pkg-config Qt5Core --variable=host_bins`
           if test_compile "$LIBQT5 $LIBPTHREAD $FLGQT5" qt5 qt5 nofatal; then
-            test_execute_path "`strip_L "$LIBQT5"`" nofatal && foundqt5=3 # pkg-config
+            test_execute_path "`L_to_PATH "$LIBQT5"`" nofatal && foundqt5=3 # pkg-config
           fi
         fi
@@ -1551 +1556 @@
         TOOLQT5="$q"
         if test_compile "$LIBQT5 $LIBPTHREAD $I_INCQT5 $FLGQT5" qt5 qt5 nofatal &&
-            test_execute_path "`strip_L "$LIBQT5"`" nofatal; then
+            test_execute_path "`L_to_PATH "$LIBQT5"`" nofatal; then
           foundqt5=2 # internal
           break;
@@ -1557 +1562 @@
         LIBQT5="-L$q/lib -lQt5Core"
         if test_compile "$LIBQT5 $LIBPTHREAD $I_INCQT5 $FLGQT5" qt5 qt5 nofatal &&
-            test_execute_path "`strip_L "$LIBQT5"`" nofatal; then
+            test_execute_path "`L_to_PATH "$LIBQT5"`" nofatal; then
           foundqt5=1 # no pkg-config, Qt directory
           break;
@@ -1587 +1592 @@
     [ -n "$INCQT5" ] && I_INCQT5=`prefix_I "$INCQT5"`
     if test_compile "$LIBQT5 $LIBPTHREAD $I_INCQT5 $FLGQT5" qt5 qt5 nofatal; then
-      if test_execute_path "`strip_L "$LIBQT5"`"; then
+      if test_execute_path "`L_to_PATH "$LIBQT5"`"; then
         if [ "$OS" = "darwin" ]; then
           # Successful build & run the test application so add the necessary