From 9953393593e885d981331a2e01bc9f2c868b939a Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Mon, 6 May 2013 21:33:57 +0200 Subject: Make the configure script to accept "-no-harfbuzz" switch ./configure -h lists "-no-harfbuzz" as a valid option, configuring with this switch gives an error message: "-no-harfbuzz: invalid command-line switch" Change-Id: I77aa68d17805170189150198dc9abea5f8cfa5c2 Reviewed-by: Oswald Buddenhagen --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 9c86fa1e5d..e112999508 100755 --- a/configure +++ b/configure @@ -1409,7 +1409,7 @@ while [ "$#" -gt 0 ]; do OPT_OBSOLETE_HOST_ARG=yes ;; harfbuzz) - if [ "$BUILD_ON_MAC" = "yes" ] && [ "$VAL" = "yes" ]; then + if ([ "$BUILD_ON_MAC" = "yes" ] && [ "$VAL" = "yes" ]) || [ "$VAL" = "no" ]; then CFG_MAC_HARFBUZZ="$VAL" else UNKNOWN_OPT=yes -- cgit v1.2.3 From 2122e731abdb619249df89642c0800640b2fa428 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Thu, 11 Apr 2013 10:51:49 +0200 Subject: Add libxkbcommon to 3rd party libs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This library is required by the XCB platform plugin. As we depend on very recent version of this library and it might not be available in base repositories of distributions, users can use -qt-xkbcommom switch to build Qt with the bundled version. Change-Id: I0ed2a5cc2f1df98b0e7cc926cabfa69818674e08 Reviewed-by: Samuel Rødal --- configure | 69 +++++++++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 52 insertions(+), 17 deletions(-) (limited to 'configure') diff --git a/configure b/configure index e112999508..3cc52b5541 100755 --- a/configure +++ b/configure @@ -901,7 +901,7 @@ CFG_USE_GNUMAKE=no CFG_XINPUT2=auto CFG_XINPUT=runtime CFG_XKB=auto -CFG_XKBCOMMON=no +CFG_XKBCOMMON=auto CFG_XCB=auto CFG_XCB_GLX=no CFG_EGLFS=auto @@ -1839,6 +1839,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + xkbcommon) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "qt" ] || [ "$VAL" = "system" ]; then + CFG_XKBCOMMON="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; xcb) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ] || [ "$VAL" = "qt" ]; then CFG_XCB="$VAL" @@ -2360,6 +2367,11 @@ if [ "$PLATFORM_MAC" = "no" -a "$CFG_DEBUG_RELEASE" = "yes" ]; then echo fi +if [ "$CFG_XCB" != "no" ] && [ "$CFG_XKBCOMMON" = "no" ]; then + echo "Error: -no-xkbcommon is not supported on XCB platform plugin." + exit 101 +fi + if [ "$CFG_SILENT" = "yes" ]; then QMAKE_CONFIG="$QMAKE_CONFIG silent" fi @@ -3436,6 +3448,9 @@ Third Party Libraries: (libxcb.so will still be used from operating system). + -system-xcb ........ Use xcb- libraries from the operating system. + -qt-xkbcommon ...... Use the xkbcommon library bundled with Qt. + + -system-xkbcommon .. Use the xkbcommon library from the operating system. + Additional options: -make ....... Add part to the list of parts to be built at make time. @@ -5168,7 +5183,7 @@ if [ "$CFG_XCB" != "no" ]; then fi else echo "The test for linking against libxcb and support libraries failed!" - echo " You might need install dependency packages, or pass -qt-xcb." + echo " You might need to install dependency packages, or pass -qt-xcb." echo " See src/plugins/platforms/xcb/README." exit 1 fi @@ -5258,18 +5273,32 @@ if [ "$CFG_KMS" != "no" ]; then fi # Detect libxkbcommon -if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xkbcommon >= 0.2.0" 2>/dev/null; then - QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon 2>/dev/null`" - QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon 2>/dev/null`" - QT_CONFIG="$QT_CONFIG xkbcommon" - CFG_XKBCOMMON=yes -elif [ "$CFG_XCB" != "no" ]; then - QMakeVar add DEFINES QT_NO_XKBCOMMON +ORIG_CFG_XKBCOMMON="$CFG_XKBCOMMON" +if [ "$CFG_XKBCOMMON" != "qt" ]; then + # currently only xcb platform plugin requires xkbcommon, for other platforms it can be set to 'no' + if [ "$CFG_XKBCOMMON" != "no" ]; then + if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xkbcommon >= 0.2.0" 2>/dev/null; then + QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon 2>/dev/null`" + QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon 2>/dev/null`" + + QMakeVar set QMAKE_CFLAGS_XKBCOMMON "$QMAKE_CFLAGS_XKBCOMMON" + QMakeVar set QMAKE_LIBS_XKBCOMMON "$QMAKE_LIBS_XKBCOMMON" + CFG_XKBCOMMON=yes + else + CFG_XKBCOMMON=no + fi + + if [ "$CFG_XCB" != "no" ] && [ "$CFG_XKBCOMMON" = "no" ]; then + # use the bundled version instead + CFG_XKBCOMMON=qt + fi + fi fi -if [ "$CFG_XKBCOMMON" != "no" ]; then - QMakeVar set QMAKE_CFLAGS_XKBCOMMON "$QMAKE_CFLAGS_XKBCOMMON" - QMakeVar set QMAKE_LIBS_XKBCOMMON "$QMAKE_LIBS_XKBCOMMON" +if [ "$CFG_XKBCOMMON" = "qt" ]; then + QT_CONFIG="$QT_CONFIG xkbcommon-qt" +elif [ "$CFG_XKBCOMMON" = "no" ]; then + QMakeVar add DEFINES QT_NO_XKBCOMMON fi # EGL Support @@ -6744,7 +6773,14 @@ echo " SQLite 2 ............. $CFG_SQL_sqlite2" echo " SQLite ............... $CFG_SQL_sqlite ($CFG_SQLITE)" echo " TDS .................. $CFG_SQL_tds" echo " udev ................... $CFG_LIBUDEV" -echo " xkbcommon .............. $CFG_XKBCOMMON" +if [ "$CFG_XKBCOMMON" = "no" ]; then + echo " xkbcommon............... no" +else + xkbcommon_sys=system + [ "$CFG_XKBCOMMON" = "qt" ] && xkbcommon_sys=qt + echo " xkbcommon............... yes ($xkbcommon_sys)" + unset xkbcommon_sys +fi if [ "$CFG_ZLIB" = "no" ]; then echo " zlib ................... no" else @@ -6772,10 +6808,9 @@ if [ "$CFG_OPENSSL" = "linked" ] && [ "$OPENSSL_LIBS" = "" ]; then echo " OPENSSL_LIBS='-L/opt/ssl/lib -lssl -lcrypto' ./configure -openssl-linked" echo fi -if [ "$CFG_XCB" != no ] && [ "$CFG_XKBCOMMON" = "no" ]; then - echo "WARNING: XCB support enabled but libxkbcommon 0.2.0 (or higher) not found." - echo "Not satisfying this requirement will disable the compose key functionality," - echo "which includes text input with dead keys." +if [ "$ORIG_CFG_XKBCOMMON" != qt ] && [ "$CFG_XKBCOMMON" = qt ]; then + echo "NOTE: libxkbcommon 0.2.0 (or higher) not found on the system, will use " + echo "the bundled version from 3rd party directory." fi exec 1>&3 3>&- # restore stdout -- cgit v1.2.3 From 9c1d62cc95ed2579fa25d83901c7a1aa315aa2d3 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Tue, 2 Apr 2013 17:25:19 +0200 Subject: Add xcb-xkb to 3rd party libs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1) -qt-xcb a) Use xkb from the 3rd party libs. As it is done for the other xcb dependencies when qt configure with -qt-xcb. 2) -system-xcb (default) a) If xkb found then use xkb from the system. (Currenly xkb is not enabled by default when configuring libxcb library). b) If xkb can't be found on the system then keyboard state will be updated from X11 core events. Change-Id: I7c3dbce6daa2cec52067cd5af80f19040233a0db Reviewed-by: Samuel Rødal --- configure | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'configure') diff --git a/configure b/configure index 3cc52b5541..ab5e7ecbb0 100755 --- a/configure +++ b/configure @@ -5170,6 +5170,16 @@ if [ "$CFG_XCB" != "no" ]; then XCB_PACKAGES="xcb xcb-shm xcb-sync xcb-xfixes xcb-randr xcb-image xcb-keysyms xcb-icccm" QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags $XCB_PACKAGES 2>/dev/null`" QMAKE_LIBS_XCB="`$PKG_CONFIG --libs $XCB_PACKAGES 2>/dev/null`" + # for xcb-xkb tests + QMAKE_CFLAGS_XKB="`$PKG_CONFIG --cflags xcb xcb-xkb 2>/dev/null`" + QMAKE_LIBS_XKB="`$PKG_CONFIG --libs xcb xcb-xkb 2>/dev/null`" + fi + + if compileTest qpa/xcb-xkb "xcb-xkb" $QMAKE_CFLAGS_XKB $QMAKE_LIBS_XKB; then + CFG_XKB=yes + else + CFG_XKB=no + QMakeVar add DEFINES QT_NO_XKB fi if compileTest qpa/xcb-syslibs "xcb-syslibs" $QMAKE_CFLAGS_XCB $QMAKE_LIBS_XCB; then -- cgit v1.2.3 From a2a8a9ea0159cc6239737de2d745129f01c94d37 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Mon, 29 Apr 2013 20:26:25 +0200 Subject: Make access to xkbcommon_workaround.h more generic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It makes more sense to keep this workaround header together with the other libxkbcommon files for a better access point since it's used by several *.pro files. Change-Id: I63d4eb58f6e7f3852834e41c4b6e058a2c962233 Reviewed-by: Oswald Buddenhagen Reviewed-by: Samuel Rødal --- configure | 2 ++ 1 file changed, 2 insertions(+) (limited to 'configure') diff --git a/configure b/configure index ab5e7ecbb0..aa840cbd73 100755 --- a/configure +++ b/configure @@ -5290,9 +5290,11 @@ if [ "$CFG_XKBCOMMON" != "qt" ]; then if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xkbcommon >= 0.2.0" 2>/dev/null; then QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon 2>/dev/null`" QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon 2>/dev/null`" + QMAKE_VERSION_XKBCOMMON="`$PKG_CONFIG --modversion xkbcommon 2>/dev/null`" QMakeVar set QMAKE_CFLAGS_XKBCOMMON "$QMAKE_CFLAGS_XKBCOMMON" QMakeVar set QMAKE_LIBS_XKBCOMMON "$QMAKE_LIBS_XKBCOMMON" + QMakeVar set QMAKE_VERSION_XKBCOMMON "$QMAKE_VERSION_XKBCOMMON" CFG_XKBCOMMON=yes else CFG_XKBCOMMON=no -- cgit v1.2.3 From 3e37e3c3e9ba16e8cc7a3bfc1c17539348df0cd6 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 8 Apr 2013 23:37:07 -0700 Subject: Make the configure summary even prettier Change-Id: Ie040fe142a5ee74c7f38a3fd2e6806b41aec4976 Reviewed-by: Oswald Buddenhagen --- configure | 239 ++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 115 insertions(+), 124 deletions(-) (limited to 'configure') diff --git a/configure b/configure index aa840cbd73..e1e455eeaf 100755 --- a/configure +++ b/configure @@ -6608,6 +6608,50 @@ fi #------------------------------------------------------------------------------- exec 3>&1 1>$outpath/config.summary # redirect output temporarily to config.summary +report_support() +{ + case "$#,$2" in + 2,auto) + # 2 arguments and the result is "auto", so just say "yes" + # this is usually an error in the configure script, but oh well.. + echo "$1 yes" + return + ;; + [012],* | *,no*) + # 0, 1 or 2 arguments, or anything starting with "no" + # print just the first part of the argument (before the dash) + echo "$1 ${2%%-*}" + return + :; + esac + local heading + heading=$1 + shift + + local value + value=$1 + shift + + while [ $# -gt 0 ]; do + if [ "$value" = "$1" ]; then + echo "$heading yes ($2)" + return + fi + shift + shift + done + echo "$heading $value" +} + +report_support_plugin() +{ + report_support "$1" "$2-$3" \ + yes-qt "in $4, using bundled copy" \ + yes-system "in $4, using system library" \ + plugin-qt "plugin, using bundled copy" \ + plugin-system "plugin, using system library" +} + echo echo " Configure summary" echo @@ -6665,142 +6709,89 @@ fi # Qt modules echo echo "Qt modules and options:" -[ "$CFG_DBUS" = "no" ] && echo " Qt D-Bus ............... no" -[ "$CFG_DBUS" = "yes" ] && echo " Qt D-Bus ............... yes (loading dbus-1 at runtime)" -[ "$CFG_DBUS" = "linked" ] && echo " Qt D-Bus ............... yes (linked to dbus-1)" -echo " Qt Concurrent .......... $CFG_CONCURRENT" -echo " Qt GUI ................. $CFG_GUI" -echo " Qt Widgets ............. $CFG_WIDGETS" -if [ "$CFG_JAVASCRIPTCORE_JIT" = "auto" ]; then - echo " JavaScriptCore JIT ..... To be decided by JavaScriptCore" -else - echo " JavaScriptCore JIT ..... $CFG_JAVASCRIPTCORE_JIT" -fi -echo " QML debugging .......... $CFG_QML_DEBUG" -echo " Use system proxies ..... $CFG_SYSTEM_PROXIES" +report_support " Qt D-Bus ..............." "$CFG_DBUS" yes "loading dbus-1 at runtime" linked "linked to dbus-1" +report_support " Qt Concurrent .........." "$CFG_CONCURRENT" +report_support " Qt GUI ................." "$CFG_GUI" +report_support " Qt Widgets ............." "$CFG_WIDGETS" +report_support " JavaScriptCore JIT ....." "$CFG_JAVASCRIPTCORE_JIT" auto "To be decided by JavaScriptCore" +report_support " QML debugging .........." "$CFG_QML_DEBUG" +report_support " Use system proxies ....." "$CFG_SYSTEM_PROXIES" # Other things # Please keep sorted and properly grouped! The output is quite long, so it's # hard to find something you're searching for if it's not sorted. echo echo "Support enabled for:" -echo " Accessibility .......... $CFG_ACCESSIBILITY" -echo " ALSA ................... $CFG_ALSA" -echo " CUPS ................... $CFG_CUPS" +report_support " Accessibility .........." "$CFG_ACCESSIBILITY" +report_support " ALSA ..................." "$CFG_ALSA" +report_support " CUPS ..................." "$CFG_CUPS" [ "$XPLATFORM_MINGW" = "yes" ] && \ - echo " DirectWrite ............ $CFG_DIRECTWRITE" -echo " FontConfig ............. $CFG_FONTCONFIG" -echo " Iconv .................. $CFG_ICONV" -echo " ICU .................... $CFG_ICU" -echo " Image formats:" -echo " GIF .................. $CFG_GIF" -if [ "$CFG_JPEG" = "no" ]; then - echo " JPEG ................. $CFG_JPEG" -else - echo " JPEG ................. $CFG_JPEG ($CFG_LIBJPEG)" -fi -if [ "$CFG_PNG" = "no" ]; then - echo " PNG .................. $CFG_PNG" -else - echo " PNG .................. $CFG_PNG ($CFG_LIBPNG)" -fi -echo " Glib ................... $CFG_GLIB" -echo " GStreamer .............. $CFG_GSTREAMER" -echo " GTK theme .............. $CFG_QGTKSTYLE" -echo " Large Files ............ $CFG_LARGEFILE" -echo " Networking:" + report_support " DirectWrite ............" "$CFG_DIRECTWRITE" +report_support " FontConfig ............." "$CFG_FONTCONFIG" +report_support " Iconv .................." "$CFG_ICONV" +report_support " ICU ...................." "$CFG_ICU" +report_support " Image formats:" +report_support_plugin " GIF .................." "$CFG_GIF" system QtGui +report_support_plugin " JPEG ................." "$CFG_JPEG" "$CFG_LIBJPEG" QtGui +report_support_plugin " PNG .................." "$CFG_PNG" "$CFG_LIBPNG" QtGui +report_support " Glib ..................." "$CFG_GLIB" +report_support " GStreamer .............." "$CFG_GSTREAMER" +report_support " GTK theme .............." "$CFG_QGTKSTYLE" +report_support " Large File ............." "$CFG_LARGEFILE" +report_support " libudev ................" "$CFG_LIBUDEV" +report_support " Networking:" [ "$BUILD_ON_MAC" = "yes" ] && \ - echo " CoreWlan ............. $CFG_COREWLAN" -echo " getaddrinfo .......... $CFG_GETADDRINFO" -echo " getifaddrs ........... $CFG_GETIFADDRS" -echo " IPv6 ifname .......... $CFG_IPV6IFNAME" -OPENSSL_LINKAGE="" -if [ "$CFG_OPENSSL" = "yes" ]; then - OPENSSL_LINKAGE="(loading libraries at run-time)" -elif [ "$CFG_OPENSSL" = "linked" ]; then - OPENSSL_LINKAGE="(linked to the libraries)" -fi -echo " OpenSSL .............. $CFG_OPENSSL $OPENSSL_LINKAGE" -unset OPENSSL_LINKAGE -echo " NIS .................... $CFG_NIS" -if [ "$CFG_OPENGL" = "desktop" ]; then - echo " OpenGL ................. yes (Desktop OpenGL)" -elif [ "$CFG_OPENGL" = "es2" ]; then - echo " OpenGL ................. yes (OpenGL ES 2.x)" -else - echo " OpenGL ................. no" -fi -if [ "$CFG_OPENVG" ]; then - if [ "$CFG_OPENVG_SHIVA" = "yes" ]; then - echo " OpenVG ................. ShivaVG" - else - echo " OpenVG ................. $CFG_OPENVG" - fi -fi -if [ "$CFG_PCRE" = "no" ]; then - echo " PCRE ................... no" -else - pcre_sys=system - [ "$CFG_PCRE" = "qt" ] && pcre_sys=qt - echo " PCRE ................... yes ($pcre_sys)" - unset pcre_sys -fi + report_support " CoreWlan ............." "$CFG_COREWLAN" +report_support " getaddrinfo .........." "$CFG_GETADDRINFO" +report_support " getifaddrs ..........." "$CFG_GETIFADDRS" +report_support " IPv6 ifname .........." "$CFG_IPV6IFNAME" +report_support " OpenSSL .............." "$CFG_OPENSSL" yes "loading libraries at run-time" linked "linked to the libraries" +report_support " NIS ...................." "$CFG_NIS" +report_support " OpenGL ................." "$CFG_OPENGL" yes "Desktop OpenGL" es2 "OpenGL ES 2.x" +report_support " OpenVG ................." "$CFG_OPENVG-$CFG_OPENVG_SHIVA" yes-yes "ShivaVG" yes-no "native" +report_support " PCRE ..................." "$CFG_PCRE" yes "system library" qt "bundled copy" if [ -n "$PKG_CONFIG" ]; then - echo " pkg-config ............. yes" + report_support " pkg-config ............. yes" else - echo " pkg-config ............. no" -fi -echo " PulseAudio ............. $CFG_PULSEAUDIO" -echo " QPA backends:" -echo " DirectFB ............. $CFG_DIRECTFB" -echo " EGLFS ................ $CFG_EGLFS" -echo " KMS .................. $CFG_KMS" -echo " LinuxFB .............. $CFG_LINUXFB" -echo " XCB .................. $CFG_XCB" + report_support " pkg-config ............. no" +fi +report_support " PulseAudio ............." "$CFG_PULSEAUDIO" +report_support " QPA backends:" +report_support " DirectFB ............." "$CFG_DIRECTFB" +report_support " EGLFS ................" "$CFG_EGLFS" +report_support " KMS .................." "$CFG_KMS" +report_support " LinuxFB .............." "$CFG_LINUXFB" +report_support " XCB .................." "$CFG_XCB" system "system library" qt "bundled copy" if [ "$CFG_XCB" != "no" ]; then - echo " MIT-SHM ............ $CFG_MITSHM" - echo " Xcursor ............ $CFG_XCURSOR" - echo " Xfixes ............. $CFG_XFIXES" - echo " Xi ................. $CFG_XINPUT" - echo " Xi2 ................ $CFG_XINPUT2" - echo " Xinerama ........... $CFG_XINERAMA" - echo " Xrandr ............. $CFG_XRANDR" - echo " Xrender ............ $CFG_XRENDER" - echo " XKB ................ $CFG_XKB" - echo " XShape ............. $CFG_XSHAPE" - echo " XSync .............. $CFG_XSYNC" - echo " XVideo ............. $CFG_XVIDEO" -fi -echo " Session management ..... $CFG_SM" + report_support " MIT-SHM ............" "$CFG_MITSHM" + report_support " Xcursor ............" "$CFG_XCURSOR" runtime "loaded at runtime" + report_support " Xfixes ............." "$CFG_XFIXES" runtime "loaded at runtime" + report_support " Xi ................." "$CFG_XINPUT" runtime "loaded at runtime" + report_support " Xi2 ................" "$CFG_XINPUT2" runtime "loaded at runtime" + report_support " Xinerama ..........." "$CFG_XINERAMA" runtime "loaded at runtime" + report_support " Xrandr ............." "$CFG_XRANDR" runtime "loaded at runtime" + report_support " Xrender ............" "$CFG_XRENDER" + report_support " XKB ................" "$CFG_XKB" + report_support " XShape ............." "$CFG_XSHAPE" + report_support " XSync .............." "$CFG_XSYNC" + report_support " XVideo ............." "$CFG_XVIDEO" +fi +report_support " Session management ....." "$CFG_SM" [ "$XPLATFORM_QNX" = "yes" ] && \ - echo " SLOG2 .................. $CFG_SLOG2" -echo " SQL drivers:" -echo " DB2 .................. $CFG_SQL_db2" -echo " InterBase ............ $CFG_SQL_ibase" -echo " MySQL ................ $CFG_SQL_mysql" -echo " OCI .................. $CFG_SQL_oci" -echo " ODBC ................. $CFG_SQL_odbc" -echo " PostgreSQL ........... $CFG_SQL_psql" -echo " SQLite 2 ............. $CFG_SQL_sqlite2" -echo " SQLite ............... $CFG_SQL_sqlite ($CFG_SQLITE)" -echo " TDS .................. $CFG_SQL_tds" -echo " udev ................... $CFG_LIBUDEV" -if [ "$CFG_XKBCOMMON" = "no" ]; then - echo " xkbcommon............... no" -else - xkbcommon_sys=system - [ "$CFG_XKBCOMMON" = "qt" ] && xkbcommon_sys=qt - echo " xkbcommon............... yes ($xkbcommon_sys)" - unset xkbcommon_sys -fi -if [ "$CFG_ZLIB" = "no" ]; then - echo " zlib ................... no" -else - zlib_sys=system - [ "$CFG_ZLIB" = "yes" ] && zlib_sys=qt - echo " zlib ................... yes ($zlib_sys)" - unset zlib_sys -fi + report_support " SLOG2 .................." "$CFG_SLOG2" +report_support " SQL drivers:" +report_support " DB2 .................." "$CFG_SQL_db2" plugin "plugin" yes "built into QtSql" +report_support " InterBase ............" "$CFG_SQL_ibase" plugin "plugin" yes "built into QtSql" +report_support " MySQL ................" "$CFG_SQL_mysql" plugin "plugin" yes "built into QtSql" +report_support " OCI .................." "$CFG_SQL_oci" plugin "plugin" yes "built into QtSql" +report_support " ODBC ................." "$CFG_SQL_odbc" plugin "plugin" yes "built into QtSql" +report_support " PostgreSQL ..........." "$CFG_SQL_psql" plugin "plugin" yes "built into QtSql" +report_support " SQLite 2 ............." "$CFG_SQL_sqlite2" plugin "plugin" yes "built into QtSql" +report_support_plugin " SQLite ..............." "$CFG_SQL_sqlite" "$CFG_SQLITE" QtSql +report_support " TDS .................." "$CFG_SQL_tds" plugin "plugin" yes "built into QtSql" +report_support " udev ..................." "$CFG_LIBUDEV" +report_support " xkbcommon .............." "$CFG_XKBCOMMON" system "system library" qt "bundled copy" +report_support " zlib ..................." "$CFG_ZLIB" system "system library" yes "bundled copy" echo -- cgit v1.2.3 From a9952689c71ffa1204151238820405316f1fe657 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 11 May 2013 22:36:51 +0100 Subject: MSYS: Force relpath and outpath into same pathing namespace. MSYS bash (and other msys-compiled executables) perform path transformation much like Cygwin. This causes syncqt path substitution to not work correctly, so use 'pwd -W' to get the Windows version (though with forward slashes) of both relpath and outpath. Change-Id: I808e3ef9206ed5f5bd8b6879d12afe664e589e0c Reviewed-by: Alvaro Burnett Reviewed-by: Oswald Buddenhagen --- configure | 2 ++ 1 file changed, 2 insertions(+) (limited to 'configure') diff --git a/configure b/configure index e1e455eeaf..8c6e8ef1f5 100755 --- a/configure +++ b/configure @@ -446,6 +446,8 @@ if [ "$OSTYPE" = "msys" ]; then BUILD_ON_MSYS=yes DEV_NULL=/tmp/empty-file echo "" > $DEV_NULL + relpath=`(cd "$relpath"; pwd -W)` + outpath=`pwd -W` fi #------------------------------------------------------------------------------- -- cgit v1.2.3 From 8739487b1ce2dc2b93fe7ff283c76f6a56919f1b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 8 May 2013 15:30:56 +0200 Subject: install host libraries into -hostprefix ... and introduce -hostlibdir configure option for symmetry. the libraries built for the host have no business in the target prefix. in principle this code would even support dynamically linked host libraries, but that's currently unused. Task-number: QTBUG-30591 Change-Id: I8e600fa4911a020fb0e87fbf7ef2f35647c7c4d5 Reviewed-by: Joerg Bornemann Reviewed-by: Ivan Romanov --- configure | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 8c6e8ef1f5..b92c4cf25b 100755 --- a/configure +++ b/configure @@ -1003,6 +1003,7 @@ CFG_SYSROOT= CFG_GCC_SYSROOT="yes" QT_HOST_PREFIX= QT_HOST_BINS= +QT_HOST_LIBS= QT_HOST_DATA= #flags for SQL drivers @@ -1111,7 +1112,7 @@ while [ "$#" -gt 0 ]; do VAL=no ;; #Qt style options that pass an argument - -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-skip|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig|-android-sdk|-android-ndk|-android-ndk-platform|-android-ndk-host|-android-arch|-android-toolchain-version) + -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-skip|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-hostlibdir|-qpa|-qconfig|-android-sdk|-android-ndk|-android-ndk-platform|-android-ndk-host|-android-arch|-android-toolchain-version) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` shift VAL="$1" @@ -1296,6 +1297,9 @@ while [ "$#" -gt 0 ]; do hostbindir) QT_HOST_BINS="$VAL" ;; + hostlibdir) + QT_HOST_LIBS="$VAL" + ;; pkg-config) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_PKGCONFIG="$VAL" @@ -3152,6 +3156,15 @@ if [ -z "$QT_HOST_BINS" ]; then #default fi QT_HOST_BINS=`"$relpath/config.tests/unix/makeabs" "$QT_HOST_BINS"` +if [ -z "$QT_HOST_LIBS" ]; then #default + if $haveHpx; then + QT_HOST_LIBS="$QT_HOST_PREFIX/lib" #fallback + else + QT_HOST_LIBS="$QT_INSTALL_LIBS" + fi +fi +QT_HOST_LIBS=`"$relpath/config.tests/unix/makeabs" "$QT_HOST_LIBS"` + if [ -z "$QT_HOST_DATA" ]; then #default if $haveHpx; then QT_HOST_DATA="$QT_HOST_PREFIX" @@ -3325,6 +3338,8 @@ Installation options: -hostbindir .. Host executables will be installed to (default HOSTPREFIX/bin) + -hostlibdir .. Host libraries will be installed to + (default HOSTPREFIX/lib) -hostdatadir . Data used by qmake will be installed to (default HOSTPREFIX) @@ -3839,6 +3854,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { "qt_ssrtpath=$CFG_SYSROOT", "qt_hpfxpath=$QT_HOST_PREFIX", "qt_hbinpath=$QT_HOST_BINS", + "qt_hlibpath=$QT_HOST_LIBS", "qt_hdatpath=$QT_HOST_DATA", "qt_targspec=$shortxspec", "qt_hostspec=$shortspec", -- cgit v1.2.3 From 7db165d9e0a77d7b314b2ef004fff6f9149a704e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 8 May 2013 16:34:44 +0200 Subject: don't try to shadow scripts which are not even there Change-Id: Ia8517ebc43488b8b92b142fa6b9f483b8fbe8a32 Reviewed-by: Joerg Bornemann --- configure | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'configure') diff --git a/configure b/configure index b92c4cf25b..fd0dbc9660 100755 --- a/configure +++ b/configure @@ -2405,17 +2405,6 @@ if [ "$OPT_SHADOW" = "yes" ]; then chmod 755 "$outpath/bin/syncqt" fi - for i in elf2e32_qtwrapper createpackage patch_capabilities qtmodule-configtests; do - rm -f "$outpath/bin/$i" - if [ -x "$relpath/bin/$i" ]; then - mkdir -p "$outpath/bin" - echo "#!/bin/sh" >"$outpath/bin/$i" - echo "QTDIR=\"$relpath\"; export QTDIR" >>"$outpath/bin/$i" - echo "\"$relpath/bin/$i\" \"\$@\"" >>"$outpath/bin/$i" - chmod 755 "$outpath/bin/$i" - fi - done - # save a pre-existing mkspecs/modules dir test -d "$outpath/mkspecs/modules" && \ mv "$outpath/mkspecs/modules" "$outpath/mkspecs-modules" -- cgit v1.2.3 From 6b38524bba4254c06ac5811fdde66bcafb49632f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 10 May 2013 18:21:27 +0200 Subject: get rid of syncqt wrapper scripts instead, rename it to syncqt.pl and rely on qtPrepareTool()'s new ability to correctly invoke it as a perl script even under windows. the wrappers themselves have been trivial at this point, so there is no added value in keeping them, either. Change-Id: I77cf65edbcfaa48ed1900defe940d4eb4b82d5b9 Reviewed-by: Thiago Macieira Reviewed-by: Joerg Bornemann --- configure | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'configure') diff --git a/configure b/configure index fd0dbc9660..a7c72c449e 100755 --- a/configure +++ b/configure @@ -2396,15 +2396,6 @@ if [ "$OPT_SHADOW" = "yes" ]; then [ -d "$outpath/bin" ] || mkdir -p "$outpath/bin" - # make a syncqt script that can be used in the shadow - rm -f "$outpath/bin/syncqt" - if [ -x "$relpath/bin/syncqt" ]; then - mkdir -p "$outpath/bin" - echo "#!/bin/sh" >"$outpath/bin/syncqt" - echo "perl \"$relpath/bin/syncqt\" \"\$@\"" >>"$outpath/bin/syncqt" - chmod 755 "$outpath/bin/syncqt" - fi - # save a pre-existing mkspecs/modules dir test -d "$outpath/mkspecs/modules" && \ mv "$outpath/mkspecs/modules" "$outpath/mkspecs-modules" @@ -3892,8 +3883,8 @@ fi # ----------------------------------------------------------------------------- # symlink includes -if [ -n "$PERL" ] && [ -x "$relpath/bin/syncqt" ]; then - "$outpath/bin/syncqt" -minimal -module QtCore "$relpath" || exit 1 +if [ -n "$PERL" ] && [ -x "$relpath/bin/syncqt.pl" ]; then + "$relpath/bin/syncqt.pl" -minimal -module QtCore "$relpath" || exit 1 fi # $1: input variable name (awk regexp) -- cgit v1.2.3 From 0feb1aadfdd0654f17b523035e57ddf35efd11cf Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 15 May 2013 13:51:46 +0200 Subject: configure/Mac: Handle errors by xcrun. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit xcrun occasionally prompts for a license or outputs errors which results in: configure: line 2488: [: : integer expression expected Check the output and bail out on error. Change-Id: Ic1ae62b5f19cf87365c38901e98d6b385cdb39a4 Reviewed-by: Tor Arne Vestbø --- configure | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index a7c72c449e..f13debc20d 100755 --- a/configure +++ b/configure @@ -2483,7 +2483,10 @@ if [ -z "$PLATFORM" ]; then # about the OS version, since we're not using the clang version that comes # with the system. We use 'xcrun' to check the clang version that's part of # the Xcode installation. - if [ "$(/usr/bin/xcrun -sdk macosx clang -v 2>&1 | sed -n 's/.*version \([0-9]\).*/\1/p')" -ge 3 ]; then + XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1` + CLANGVERSION=`echo "$XCRUN" | sed -n 's/.*version \([0-9]\).*/\1/p'` + expr "$CLANGVERSION" : '[0-9]' > /dev/null || { echo "Unable to determine CLANG version from output of xcrun: $XCRUN" ; exit 2 ; } + if [ "$CLANGVERSION" -ge 3 ]; then PLATFORM=macx-clang # Advertise g++ as an alternative on Lion and below -- cgit v1.2.3 From c3488be438a80256f0f699efd7ee796939b83c17 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Fri, 17 May 2013 22:51:08 +0100 Subject: Android: Remove libgnustl_shared.so copy hack. It's not needed, and when $outpath/lib doesn't already exist (when shadow-building for example), $outpath/lib ends up being a copy of libgnustl_shared.so, when it really must be a folder. Change-Id: Iaf3af6f4183090137043549cb8d9899c2bc92f24 Reviewed-by: Eskil Abrahamsen Blomfeldt --- configure | 4 ---- 1 file changed, 4 deletions(-) (limited to 'configure') diff --git a/configure b/configure index f13debc20d..8427e323c6 100755 --- a/configure +++ b/configure @@ -2714,10 +2714,6 @@ if [ "$XPLATFORM_ANDROID" = "yes" ]; then QT_QPA_DEFAULT_PLATFORM="android" CFG_LARGEFILE="no" - # FIXME: Qt Creator requires this to be in the lib/ directory of Qt. This line can be removed - # once it's fixed to get the file directly from the NDK. - cp -f $CFG_DEFAULT_ANDROID_NDK_ROOT/sources/cxx-stl/gnu-libstdc++/$CFG_DEFAULT_ANDROID_NDK_TOOLCHAIN_VERSION/libs/$CFG_DEFAULT_ANDROID_TARGET_ARCH/libgnustl_shared.so $outpath/lib - DeviceVar set DEFAULT_ANDROID_SDK_ROOT "$CFG_DEFAULT_ANDROID_SDK_ROOT" DeviceVar set DEFAULT_ANDROID_NDK_ROOT "$CFG_DEFAULT_ANDROID_NDK_ROOT" DeviceVar set DEFAULT_ANDROID_PLATFORM "$CFG_DEFAULT_ANDROID_PLATFORM" -- cgit v1.2.3