diff options
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 204 |
1 files changed, 4 insertions, 200 deletions
@@ -359,7 +359,6 @@ earlyArgParse() if [ "$PLATFORM_QPA" != "no" ]; then if [ "$PLATFORM_QPA" = "maybe" ]; then PLATFORM_X11=no - PLATFORM_MAC=no PLATFORM_QPA=yes fi else @@ -764,10 +763,6 @@ CFG_AVX=auto CFG_REDUCE_RELOCATIONS=auto CFG_NAS=no CFG_ACCESSIBILITY=auto -CFG_ENDIAN=auto -CFG_HOST_ENDIAN=auto -CFG_DOUBLEFORMAT=auto -CFG_ARMFPA=auto CFG_IWMMXT=no CFG_NEON=auto CFG_CLOCK_GETTIME=auto @@ -965,7 +960,7 @@ while [ "$#" -gt 0 ]; do VAL=no ;; #Qt style yes options - -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-xinput2|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-xcb|-wayland|-nis|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-debug-and-release|-exceptions|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-phonon-backend|-audio-backend|-declarative-debug|-javascript-jit|-rpath|-force-pkg-config|-icu|-force-asserts|-testcocoon) + -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-xinput2|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-xcb|-wayland|-nis|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-debug-and-release|-exceptions|-harfbuzz|-prefix-install|-silent|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-phonon-backend|-audio-backend|-declarative-debug|-javascript-jit|-rpath|-force-pkg-config|-icu|-force-asserts|-testcocoon) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` VAL=yes ;; @@ -1041,14 +1036,6 @@ while [ "$#" -gt 0 ]; do VAL=$1 fi ;; - -host-*-endian) - VAR=host_endian - VAL=`echo $1 | sed "s,^-.*-\(.*\)-.*,\1,"` - ;; - -*-endian) - VAR=endian - VAL=`echo $1 | sed "s,^-\(.*\)-.*,\1,"` - ;; -qtnamespace) VAR="qtnamespace" shift @@ -1231,7 +1218,6 @@ while [ "$#" -gt 0 ]; do ;; embedded-lite|qpa) PLATFORM_X11=no - PLATFORM_MAC=no PLATFORM_QPA=yes ;; sse) @@ -1241,31 +1227,6 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; - endian) - if [ "$VAL" = "little" ]; then - CFG_ENDIAN="Q_LITTLE_ENDIAN" - elif [ "$VAL" = "big" ]; then - CFG_ENDIAN="Q_BIG_ENDIAN" - else - UNKNOWN_OPT=yes - fi - ;; - host_endian) - if [ "$VAL" = "little" ]; then - CFG_HOST_ENDIAN="Q_LITTLE_ENDIAN" - elif [ "$VAL" = "big" ]; then - CFG_HOST_ENDIAN="Q_BIG_ENDIAN" - else - UNKNOWN_OPT=yes - fi - ;; - armfpa) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_ARMFPA="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; opengl) if [ "$VAL" = "auto" ] || [ "$VAL" = "desktop" ] || [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || @@ -3249,7 +3210,7 @@ Usage: $relconf [-h] [-prefix <dir>] [-prefix-install] [-bindir <dir>] [-libdir [-iconv] [-no-pch] [-pch] [-no-dbus] [-dbus] [-dbus-linked] [-no-gui] [-no-separate-debug-info] [-no-mmx] [-no-3dnow] [-no-sse] [-no-sse2] [-no-sse3] [-no-ssse3] [-no-sse4.1] [-no-sse4.2] [-no-avx] [-no-neon] - [-qtnamespace <namespace>] [-qtlibinfix <infix>] [-separate-debug-info] [-armfpa] + [-qtnamespace <namespace>] [-qtlibinfix <infix>] [-separate-debug-info] [-no-phonon-backend] [-phonon-backend] [-no-media-backend] [-media-backend] [-no-audio-backend] [-audio-backend] [-no-javascript-jit] [-javascript-jit] [-no-declarative-debug] [-declarative-debug] @@ -3793,22 +3754,6 @@ if [ "$PLATFORM_QPA" = "yes" ]; then -feature-<feature> .. Compile in <feature>. The available features are described in src/corelib/global/qfeatures.txt - -armfpa ............. Target platform uses the ARM-FPA floating point format. - -no-armfpa .......... Target platform does not use the ARM-FPA floating point format. - - The floating point format is usually autodetected by configure. Use this - to override the detected value. - - -little-endian ...... Target platform is little endian (LSB first). - -big-endian ......... Target platform is big endian (MSB first). - - -host-little-endian . Host platform is little endian (LSB first). - -host-big-endian .... Host platform is big endian (MSB first). - - You only need to specify the endianness when - cross-compiling, otherwise the host - endianness will be used. - -no-freetype ........ Do not compile in Freetype2 support. -qt-freetype ........ Use the libfreetype bundled with Qt. * -system-freetype .... Use libfreetype from the operating system. @@ -5493,6 +5438,8 @@ if [ "$PLATFORM_QPA" = "yes" ]; then echo " If you really want to build without a QPA platform plugin you must pass" echo " -no-xcb and -no-wayland to configure. Doing this will produce a Qt that" echo " cannot run GUI applications." + echo " The dependencies needed for xcb to build are listed in" + echo " src/plugins/platforms/xcb/README" exit 1 fi fi @@ -5541,93 +5488,6 @@ if [ "$CFG_LIBFREETYPE" = "auto" ]; then fi fi -if [ "$CFG_ENDIAN" = "auto" ]; then - if [ "$XPLATFORM_MINGW" = "yes" ]; then - CFG_ENDIAN="Q_LITTLE_ENDIAN" - else - "$unixtests/endian.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" "QMAKE_LFLAGS+=$SYSROOT_FLAG" - F="$?" - if [ "$F" -eq 0 ]; then - CFG_ENDIAN="Q_LITTLE_ENDIAN" - elif [ "$F" -eq 1 ]; then - CFG_ENDIAN="Q_BIG_ENDIAN" - else - echo - echo "The target system byte order could not be detected!" - echo "Turn on verbose messaging (-v) to see the final report." - echo "You can use the -little-endian or -big-endian switch to" - echo "$0 to continue." - exit 101 - fi - fi -fi - -if [ "$CFG_HOST_ENDIAN" = "auto" ]; then - if [ "$BUILD_ON_MAC" = "yes" ]; then - true #leave as auto - else - "$unixtests/endian.test" "$QMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" - F="$?" - if [ "$F" -eq 0 ]; then - CFG_HOST_ENDIAN="Q_LITTLE_ENDIAN" - elif [ "$F" -eq 1 ]; then - CFG_HOST_ENDIAN="Q_BIG_ENDIAN" - else - echo - echo "The host system byte order could not be detected!" - echo "Turn on verbose messaging (-v) to see the final report." - echo "You can use the -host-little-endian or -host-big-endian switch to" - echo "$0 to continue." - exit 101 - fi - fi -fi - -if [ "$CFG_ARMFPA" != "auto" ]; then - if [ "$CFG_ARMFPA" = "yes" ]; then - if [ "$CFG_ENDIAN" = "Q_LITTLE_ENDIAN" ]; then - CFG_DOUBLEFORMAT="Q_DOUBLE_LITTLE_SWAPPED" - else - CFG_DOUBLEFORMAT="Q_DOUBLE_BIG_SWAPPED" - fi - else - CFG_DOUBLEFORMAT="normal" - fi -fi - - -if [ "$CFG_DOUBLEFORMAT" = "auto" ]; then - if [ "$PLATFORM_QPA" = "yes" ]; then - CFG_DOUBLEFORMAT=normal - else - "$unixtests/doubleformat.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" - F="$?" - if [ "$F" -eq 10 ] && [ "$CFG_ENDIAN" = "Q_LITTLE_ENDIAN" ]; then - CFG_DOUBLEFORMAT=normal - elif [ "$F" -eq 11 ] && [ "$CFG_ENDIAN" = "Q_BIG_ENDIAN" ]; then - CFG_DOUBLEFORMAT=normal - elif [ "$F" -eq 10 ]; then - CFG_DOUBLEFORMAT="Q_DOUBLE_LITTLE" - elif [ "$F" -eq 11 ]; then - CFG_DOUBLEFORMAT="Q_DOUBLE_BIG" - elif [ "$F" -eq 12 ]; then - CFG_DOUBLEFORMAT="Q_DOUBLE_LITTLE_SWAPPED" - CFG_ARMFPA="yes" - elif [ "$F" -eq 13 ]; then - CFG_DOUBLEFORMAT="Q_DOUBLE_BIG_SWAPPED" - CFG_ARMFPA="yes" - else - echo - echo "The system floating point format could not be detected." - echo "This may cause data to be generated in a wrong format" - echo "Turn on verbose messaging (-v) to see the final report." - # we do not fail on this since this is a new test, and if it fails, - # the old behavior should be correct in most cases - CFG_DOUBLEFORMAT=normal - fi - fi -fi - HAVE_STL=no if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then HAVE_STL=yes @@ -6501,63 +6361,7 @@ cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF #ifndef QT_EDITION # define QT_EDITION $QT_EDITION #endif - -/* Machine byte-order */ -#define Q_BIG_ENDIAN 4321 -#define Q_LITTLE_ENDIAN 1234 -EOF - -echo "#ifdef QT_BOOTSTRAPPED" >>"$outpath/src/corelib/global/qconfig.h.new" -if [ "$CFG_HOST_ENDIAN" = "auto" ]; then - cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF -#if defined(__BIG_ENDIAN__) -# define Q_BYTE_ORDER Q_BIG_ENDIAN -#elif defined(__LITTLE_ENDIAN__) -# define Q_BYTE_ORDER Q_LITTLE_ENDIAN -#else -# error "Unable to determine byte order!" -#endif -EOF -else - echo "#define Q_BYTE_ORDER $CFG_HOST_ENDIAN" >>"$outpath/src/corelib/global/qconfig.h.new" -fi -echo "#else" >>"$outpath/src/corelib/global/qconfig.h.new" -if [ "$CFG_ENDIAN" = "auto" ]; then - cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF -#if defined(__BIG_ENDIAN__) -# define Q_BYTE_ORDER Q_BIG_ENDIAN -#elif defined(__LITTLE_ENDIAN__) -# define Q_BYTE_ORDER Q_LITTLE_ENDIAN -#else -# error "Unable to determine byte order!" -#endif EOF -else - echo "#define Q_BYTE_ORDER $CFG_ENDIAN" >>"$outpath/src/corelib/global/qconfig.h.new" -fi -echo "#endif" >>"$outpath/src/corelib/global/qconfig.h.new" - -if [ "$CFG_DOUBLEFORMAT" != "normal" ]; then - cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF -/* Non-IEEE double format */ -#define Q_DOUBLE_LITTLE "01234567" -#define Q_DOUBLE_BIG "76543210" -#define Q_DOUBLE_LITTLE_SWAPPED "45670123" -#define Q_DOUBLE_BIG_SWAPPED "32107654" -#define Q_DOUBLE_FORMAT $CFG_DOUBLEFORMAT -EOF -fi -if [ "$CFG_ARMFPA" = "yes" ]; then - if [ "$CFG_ARCH" != "$CFG_HOST_ARCH" ]; then - cat >>"$outpath/src/corelib/global/qconfig.h.new" <<EOF -#ifndef QT_BOOTSTRAPPED -# define QT_ARMFPA -#endif -EOF - else - echo "#define QT_ARMFPA" >>"$outpath/src/corelib/global/qconfig.h.new" - fi -fi CFG_ARCH_STR=`echo $CFG_ARCH | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` CFG_HOST_ARCH_STR=`echo $CFG_HOST_ARCH | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` |