From 07b34d934ef2227fd5bbc840d405d909e45243ac Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Thu, 23 May 2013 13:02:06 +0200 Subject: Android: detect Linux 64 bit host architecture This is the easy fix: looking at what is supported by the NDK. If people have weird setups, then they have to specify -android-ndk-host. We do actually detect the host architecture later, but using that would be a much bigger (and riskier) change. Task-number: QTBUG-31275 Change-Id: I18db878031baa2e1ee2fa4beff364d58d8bd3c7a Reviewed-by: Eskil Abrahamsen Blomfeldt Reviewed-by: Oswald Buddenhagen --- configure | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 8427e323c6..e633a780bd 100755 --- a/configure +++ b/configure @@ -2664,16 +2664,13 @@ esac if [ "$XPLATFORM_ANDROID" = "yes" ]; then if [ -z "$CFG_DEFAULT_ANDROID_NDK_HOST" ]; then case $PLATFORM in - linux-*-64) - if [ -d "$CFG_DEFAULT_ANDROID_NDK_ROOT/toolchains/arm-linux-androideabi-$CFG_DEFAULT_ANDROID_NDK_TOOLCHAIN_VERSION/prebuilt/linux-x86_64" ]; then - CFG_DEFAULT_ANDROID_NDK_HOST=linux-x86_64 - else + linux-*) + if [ -d "$CFG_DEFAULT_ANDROID_NDK_ROOT/toolchains/arm-linux-androideabi-$CFG_DEFAULT_ANDROID_NDK_TOOLCHAIN_VERSION/prebuilt/linux-x86" ]; then CFG_DEFAULT_ANDROID_NDK_HOST=linux-x86 + elif [ -d "$CFG_DEFAULT_ANDROID_NDK_ROOT/toolchains/arm-linux-androideabi-$CFG_DEFAULT_ANDROID_NDK_TOOLCHAIN_VERSION/prebuilt/linux-x86_64" ]; then + CFG_DEFAULT_ANDROID_NDK_HOST=linux-x86_64 fi ;; - linux-*) - CFG_DEFAULT_ANDROID_NDK_HOST=linux-x86 - ;; macx-*) CFG_DEFAULT_ANDROID_NDK_HOST=darwin-x86 if [ ! -z "$NATIVE_64_ARCH" ] && [ -d "$CFG_DEFAULT_ANDROID_NDK_ROOT/toolchains/arm-linux-androideabi-$CFG_DEFAULT_ANDROID_NDK_TOOLCHAIN_VERSION/prebuilt/darwin-x86_64" ]; then -- cgit v1.2.3 From 8ea19caacf281240411541b5af37c2f9a103a7d1 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 7 May 2013 17:10:22 +0200 Subject: add -compile-examples configure option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit this overrides the magic that makes examples only install their sources in production builds. packagers may want to force the build of the examples, so they can package them up for demo purposes. this is actually why we formerly had the split between demos and examples ... Task-number: QTBUG-30788 Change-Id: I5633f69404c5aa6846f5496e8f161a273a7a7da3 Reviewed-by: Joerg Bornemann Reviewed-by: Lisandro Damián Nicanor Pérez Meyer Reviewed-by: Oswald Buddenhagen --- configure | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'configure') diff --git a/configure b/configure index e633a780bd..d11a50554f 100755 --- a/configure +++ b/configure @@ -880,6 +880,7 @@ QT_DEFAULT_BUILD_PARTS="libs tools examples" CFG_BUILD_PARTS="" CFG_NOBUILD_PARTS="" CFG_SKIP_MODULES="" +CFG_COMPILE_EXAMPLES=auto CFG_RELEASE_QMAKE=no CFG_AUDIO_BACKEND=auto CFG_V8SNAPSHOT=auto @@ -1404,6 +1405,13 @@ while [ "$#" -gt 0 ]; do fi CFG_SKIP_MODULES="$CFG_SKIP_MODULES $VAL" ;; + compile-examples) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_COMPILE_EXAMPLES="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; sdk) if [ "$BUILD_ON_MAC" = "yes" ]; then DeviceVar set !host_build:QMAKE_MAC_SDK "$VAL" @@ -3151,6 +3159,18 @@ else QT_HOST_DATA=`"$relpath/config.tests/unix/makeabs" "$QT_HOST_DATA"` fi +# Do not actually build the examples in production builds with -prefix, unless requested +if [ "$CFG_COMPILE_EXAMPLES" = auto ]; then + if [ "$CFG_DEV" = "yes" ] || [ "x$outpath" = "x$QT_INSTALL_PREFIX" ]; then + CFG_COMPILE_EXAMPLES=yes + else + CFG_COMPILE_EXAMPLES=no + fi +fi +if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then + QMAKE_CONFIG="$QMAKE_CONFIG compile_examples" +fi + #------------------------------------------------------------------------------- # help - interactive parts of the script _after_ this section please #------------------------------------------------------------------------------- @@ -3452,6 +3472,8 @@ Additional options: -skip ..... Exclude an entire module from the build. + -compile-examples .. Compile examples even in a production build. + -no-gui ............ Don't build the Qt GUI module and dependencies. + -gui ............... Build the Qt GUI module and dependencies. -- cgit v1.2.3 From c3bec846ac89bb79fbdfa5e2bedb3495b0055b09 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 28 May 2013 21:40:01 +0200 Subject: remove bizarre perl detection magic the code makes no sense, and was added with the QNX port without comment. there is already a detection a few lines up. Change-Id: I18ec18604c37c7c42f2649a658dd22324d481dd3 Reviewed-by: Andreas Holzammer Reviewed-by: Harald Fernengel Reviewed-by: Rafael Roquetto --- configure | 6 ------ 1 file changed, 6 deletions(-) (limited to 'configure') diff --git a/configure b/configure index d11a50554f..079f2e7415 100755 --- a/configure +++ b/configure @@ -2344,12 +2344,6 @@ for e in gawk nawk awk; do fi done -# find perl -PERL="/usr/bin/perl" -if "$WHICH" perl >/dev/null 2>&1 && ( perl /dev/null ) >/dev/null 2>&1; then - PERL=`$WHICH perl` -fi - ### skip this if the user just needs help... if [ "$OPT_HELP" != "yes" ]; then -- cgit v1.2.3