Changeset 79836 in vbox
- Timestamp:
- Jul 17, 2019 2:57:57 PM (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/configure
r78023 r79836 243 243 } 244 244 245 L_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 245 250 strip_I() 246 251 { … … 1533 1538 TOOLQT5BIN=`pkg-config Qt5Core --variable=host_bins` 1534 1539 if test_compile "$LIBQT5 $LIBPTHREAD $FLGQT5" qt5 qt5 nofatal; then 1535 test_execute_path "` strip_L"$LIBQT5"`" nofatal && foundqt5=3 # pkg-config1540 test_execute_path "`L_to_PATH "$LIBQT5"`" nofatal && foundqt5=3 # pkg-config 1536 1541 fi 1537 1542 fi … … 1551 1556 TOOLQT5="$q" 1552 1557 if test_compile "$LIBQT5 $LIBPTHREAD $I_INCQT5 $FLGQT5" qt5 qt5 nofatal && 1553 test_execute_path "` strip_L"$LIBQT5"`" nofatal; then1558 test_execute_path "`L_to_PATH "$LIBQT5"`" nofatal; then 1554 1559 foundqt5=2 # internal 1555 1560 break; … … 1557 1562 LIBQT5="-L$q/lib -lQt5Core" 1558 1563 if test_compile "$LIBQT5 $LIBPTHREAD $I_INCQT5 $FLGQT5" qt5 qt5 nofatal && 1559 test_execute_path "` strip_L"$LIBQT5"`" nofatal; then1564 test_execute_path "`L_to_PATH "$LIBQT5"`" nofatal; then 1560 1565 foundqt5=1 # no pkg-config, Qt directory 1561 1566 break; … … 1587 1592 [ -n "$INCQT5" ] && I_INCQT5=`prefix_I "$INCQT5"` 1588 1593 if test_compile "$LIBQT5 $LIBPTHREAD $I_INCQT5 $FLGQT5" qt5 qt5 nofatal; then 1589 if test_execute_path "` strip_L"$LIBQT5"`"; then1594 if test_execute_path "`L_to_PATH "$LIBQT5"`"; then 1590 1595 if [ "$OS" = "darwin" ]; then 1591 1596 # Successful build & run the test application so add the necessary
Note:
See TracChangeset
for help on using the changeset viewer.