From 7c1326a1c390bb15eaa164f748c947f1df9f542d Mon Sep 17 00:00:00 2001 From: James McDonnell Date: Thu, 14 Apr 2016 16:48:15 -0400 Subject: Ensure -no-pch is effective Have configure add a "CONFIG -= precompile_header" to qmodule.pri when -no-pch is specified. Ensures that Qt is built without precompiled headers (as requested) even if allowing precompiled header use is the default for the toolchain. Parallels changes to Windows configure. Task-number: QTBUG-11545 Change-Id: Iab4021e74c4e9978770e917dff97b976c449dd8b Reviewed-by: Oswald Buddenhagen --- configure | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 9492cb5473..5d02827890 100755 --- a/configure +++ b/configure @@ -96,6 +96,7 @@ for i in "$@"; do done # initialize global variables +CONFIG_SEPARATORS=`printf ' \t'` QMAKE_SWITCHES= QMAKE_VARS= QMAKE_CONFIG= @@ -351,6 +352,21 @@ getXQMakeConf() getSingleQMakeVariable "$1" "$xspecvals" } +testXConfig() +{ + # Put a space on each end of the CONFIG value so that searching for the + # target with whitespace on either side will work even when it's the + # first/last/only item in the CONFIG value. + case \ `getXQMakeConf CONFIG`\ in + *[${CONFIG_SEPARATORS}]$1[${CONFIG_SEPARATORS}]*) + return 0 + ;; + *) + return 1 + ;; + esac +} + compilerSupportsFlag() { cat >conftest.cpp < Date: Wed, 11 May 2016 12:40:14 +0200 Subject: make -R and -D not affect qmake this was meant to be part of d8be8110a, as qmake is obviously also a bootstrapped tool. -I/-L/-F/-l/-fw already had no effect on qmake. Change-Id: I5095742ef5401558cc4432e7a774d0851d417bb0 Reviewed-by: Lars Knoll --- configure | 9 --------- 1 file changed, 9 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 5d02827890..f4555a746b 100755 --- a/configure +++ b/configure @@ -4051,12 +4051,6 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_DEBUG)" fi - if [ -n "$RPATH_FLAGS" ] && [ -n "`getQMakeConf 'QMAKE_(LFLAGS_)?RPATH'`" ]; then - setBootstrapVariable "QMAKE_(LFLAGS_)?RPATH" QMAKE_LFLAGS_RPATH - for rpath in $RPATH_FLAGS; do - EXTRA_LFLAGS="\$(QMAKE_LFLAGS_RPATH)\"$rpath\" $EXTRA_LFLAGS" - done - fi if [ "$BUILD_ON_MSYS" = "yes" ]; then EXTRA_CFLAGS="$EXTRA_CFLAGS -DUNICODE" EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -DUNICODE" @@ -4104,9 +4098,6 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; \"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp\" \ \"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac_objc.mm\"" fi - if [ '!' -z "$D_FLAGS" ]; then - EXTRA_CFLAGS="$EXTRA_CFLAGS $D_FLAGS" - fi echo >>"$mkfile" adjrelpath=`echo "$relpath" | sed 's/ /\\\\\\\\ /g'` adjoutpath=`echo "$outpath" | sed 's/ /\\\\\\\\ /g'` -- cgit v1.2.3 From 8d5b1bdca8b13972fc653638fca426a5485343b1 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 1 Aug 2015 13:31:55 -0700 Subject: configure: present some progress status for the detections The "checking for xxx... [yes|no]" is chosen so that it matches exactly what GNU Autoconf does. That way, any tools that parse the output will have less trouble. This feature is useful for us when debugging a build, as not all checks produce output in the configure summary. Change-Id: Id75834dab9ed466e94c7ffff14456edb646a1ced Reviewed-by: Oswald Buddenhagen --- configure | 1 + 1 file changed, 1 insertion(+) (limited to 'configure') diff --git a/configure b/configure index f4555a746b..4c052d5a23 100755 --- a/configure +++ b/configure @@ -4280,6 +4280,7 @@ compileTest() if [ "$CFG_SHARED" = "no" ]; then test_config="$QMAKE_CONFIG static" fi + echo $ECHO_N "checking for $name... $ECHO_C" "$unixtests/compile.test" "$XQMAKESPEC" "$test_config" $OPT_VERBOSE "$relpath" "$outpath" "$path" "$name" $I_FLAGS $D_FLAGS $L_FLAGS "$@" } -- cgit v1.2.3 From d179931ada9c9055eb7c86ee264fa5f2e1ec3453 Mon Sep 17 00:00:00 2001 From: James McDonnell Date: Wed, 4 May 2016 15:18:01 -0400 Subject: Warn when -fontconfig forces -system-freetype Let the user know that configure's switch from -no-freetype/-qt-freetype to -system-freetype when -fontconfig is used is expected. Task-number: QTBUG-35886 Change-Id: I95daaeffb0878bb785149f314096405a5c0fdc7a Reviewed-by: Oswald Buddenhagen --- configure | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'configure') diff --git a/configure b/configure index 4c052d5a23..ce5b9c2b27 100755 --- a/configure +++ b/configure @@ -5360,6 +5360,7 @@ if [ "$CFG_OPENGL" = "es2" ]; then fi # auto-detect FontConfig support +ORIG_CFG_FREETYPE="$CFG_FREETYPE" if [ "$CFG_FONTCONFIG" != "no" ]; then if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists fontconfig --exists freetype2 2>/dev/null; then QT_CFLAGS_FONTCONFIG=`$PKG_CONFIG --cflags fontconfig --cflags freetype2 2>/dev/null` @@ -7405,6 +7406,15 @@ if [ "$CFG_SHARED" = "no" ]; then echo "loaded plugins. Make sure to import all needed static plugins," echo "or compile needed modules into the library." fi +if [ "$CFG_FREETYPE" = "system" ]; then + if [ "$ORIG_CFG_FREETYPE" = "qt" ]; then + echo + echo "WARNING: Bundled FreeType can't be used. FontConfig use requires system FreeType." + elif [ "$ORIG_CFG_FREETYPE" = "no" ]; then + echo + echo "WARNING: FreeType can't be disabled. FontConfig use requires system FreeType." + fi +fi if [ "$CFG_OPENSSL" = "linked" ] && [ "$OPENSSL_LIBS" = "" ]; then echo echo "NOTE: When linking against OpenSSL, you can override the default" -- cgit v1.2.3 From 2852a8b87e3a8ed95b72d26b0e180b7fd4491cf3 Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Fri, 26 Feb 2016 11:53:01 -0800 Subject: XCB: Auto-detect xcb-glx also with xcb-qt Task-number: QTBUG-43784 Change-Id: Iaa0388e34900f6241db8cd864caed4fb6fc32819 Reviewed-by: Laszlo Agocs --- configure | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'configure') diff --git a/configure b/configure index ce5b9c2b27..a4819818d1 100755 --- a/configure +++ b/configure @@ -5555,6 +5555,11 @@ if [ "$CFG_XCB" != "no" ]; then if [ "$CFG_XCB" = "qt" ]; then QT_CONFIG="$QT_CONFIG xcb-qt" + + if compileTest qpa/xcb-glx "xcb-glx" $QMAKE_CFLAGS_XCB $QMAKE_LIBS_XCB; then + CFG_XCB_GLX=yes + QT_CONFIG="$QT_CONFIG xcb-glx" + fi else CFG_XCB="system" if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then -- cgit v1.2.3 From 1af3a21c63d6867a08a912053031f2a92df61f04 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 11 May 2016 19:27:54 +0200 Subject: actually build an optimized qmake in release builds release_tools is not set in pure release builds - in fact, we complain if it is. Change-Id: Ifac73c0ef6f8967155b63f7fc9c9ce9de1acf337 Reviewed-by: Lars Knoll --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index f4555a746b..4ce83be84c 100755 --- a/configure +++ b/configure @@ -4039,7 +4039,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; setBootstrapVariable QMAKE_LFLAGS setBootstrapVariable QMAKE_LFLAGS_GCSECTIONS - if [ "$CFG_RELEASE_TOOLS" = "yes" ]; then + if [ "$CFG_DEBUG" = "no" ] || [ "$CFG_RELEASE_TOOLS" = "yes" ]; then setBootstrapVariable QMAKE_CFLAGS_RELEASE setBootstrapVariable QMAKE_CXXFLAGS_RELEASE EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_RELEASE)" -- cgit v1.2.3