qt5-doc/trunk/no-qmake.patch

   1 diff --git a/configure b/configure
   2 index b6c9b462f2..b426aa2085 100755
   3 --- a/configure
   4 +++ b/configure
   5 @@ -711,105 +711,6 @@ setBootstrapVariable()
   6      getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
   7  }
   8
   9 -# build qmake
  10 -    echo "Creating qmake..."
  11 -    mkdir -p "$outpath/qmake" || exit
  12 -
  13 -        in_mkfile=$relpath/qmake/Makefile.unix
  14 -        mkfile=$outpath/qmake/Makefile
  15 -        if [ -f "$mkfile" ]; then
  16 -            [ "$CFG_DEV" = "yes" ] && "$WHICH" chflags >/dev/null 2>&1 && chflags nouchg "$mkfile"
  17 -            rm -f "$mkfile"
  18 -        fi
  19 -
  20 -        echo "########################################################################" > "$mkfile"
  21 -        echo "## This file was autogenerated by configure, all changes will be lost ##" >> "$mkfile"
  22 -        echo "########################################################################" >> "$mkfile"
  23 -        EXTRA_CXXFLAGS="\$(QMAKE_CXXFLAGS) \$(QMAKE_CXXFLAGS_CXX11) \$(QMAKE_CXXFLAGS_SPLIT_SECTIONS)"
  24 -        EXTRA_LFLAGS="\$(QMAKE_LFLAGS) \$(QMAKE_LFLAGS_GCSECTIONS)"
  25 -
  26 -        [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
  27 -        setBootstrapVariable QMAKE_CC CC "$CC_TRANSFORM"
  28 -        setBootstrapVariable QMAKE_CXX CXX "$CC_TRANSFORM"
  29 -        setBootstrapVariable QMAKE_CXXFLAGS
  30 -        setBootstrapVariable QMAKE_CXXFLAGS_CXX11
  31 -        setBootstrapVariable QMAKE_CXXFLAGS_SPLIT_SECTIONS
  32 -        setBootstrapVariable QMAKE_LFLAGS
  33 -        setBootstrapVariable QMAKE_LFLAGS_GCSECTIONS
  34 -
  35 -        if [ "$CFG_DEBUG" = "no" ] || [ "$CFG_RELEASE_TOOLS" = "yes" ]; then
  36 -            setBootstrapVariable QMAKE_CXXFLAGS_RELEASE
  37 -            EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_RELEASE)"
  38 -        else
  39 -            setBootstrapVariable QMAKE_CXXFLAGS_DEBUG
  40 -            EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_DEBUG)"
  41 -        fi
  42 -
  43 -       adjrelpath=`echo "$relpath" | sed 's/ /\\\\\\\\ /g'`
  44 -       adjoutpath=`echo "$outpath" | sed 's/ /\\\\\\\\ /g'`
  45 -       adjqmakespec=`echo "$QMAKESPEC" | sed 's/ /\\\\\\\\ /g'`
  46 -
  47 -        echo "BUILD_PATH = .." >> "$mkfile"
  48 -        echo "SOURCE_PATH = $adjrelpath" >> "$mkfile"
  49 -        if [ -e "$relpath/.git" ]; then
  50 -            echo 'INC_PATH = $(BUILD_PATH)/include' >> "$mkfile"
  51 -        else
  52 -            echo 'INC_PATH = $(SOURCE_PATH)/include' >> "$mkfile"
  53 -        fi
  54 -        echo "QMAKESPEC = $adjqmakespec" >> "$mkfile"
  55 -        echo "QT_VERSION = $QT_VERSION" >> "$mkfile"
  56 -        echo "QT_MAJOR_VERSION = $QT_MAJOR_VERSION" >> "$mkfile"
  57 -        echo "QT_MINOR_VERSION = $QT_MINOR_VERSION" >> "$mkfile"
  58 -        echo "QT_PATCH_VERSION = $QT_PATCH_VERSION" >> "$mkfile"
  59 -        echo "CONFIG_CXXFLAGS = $EXTRA_CXXFLAGS" >> "$mkfile"
  60 -        echo "CONFIG_LFLAGS = $EXTRA_LFLAGS" >> "$mkfile"
  61 -        echo "RM_F = rm -f" >> "$mkfile"
  62 -        echo "RM_RF = rm -rf" >> "$mkfile"
  63 -
  64 -        case `basename "$PLATFORM"` in
  65 -        win32-*g++*)
  66 -            cat "$in_mkfile.win32" >> "$mkfile"
  67 -            ;;
  68 -        *)
  69 -            cat "$in_mkfile.unix" >> "$mkfile"
  70 -            if [ "$BUILD_ON_MAC" = "yes" ]; then
  71 -                cat "$in_mkfile.macos" >> "$mkfile"
  72 -            fi
  73 -            ;;
  74 -        esac
  75 -        echo >>"$mkfile"
  76 -
  77 -        if [ "$BUILD_ON_MAC" = "yes" ]; then
  78 -            echo "EXTRA_CXXFLAGS += -MMD" >> "$mkfile"
  79 -            cat "$in_mkfile" >> "$mkfile"
  80 -            echo "-include \$(notdir \$(DEPEND_SRC:%.cpp=%.d))" >> "$mkfile"
  81 -        else
  82 -            cat "$in_mkfile" >> "$mkfile"
  83 -            if "$WHICH" makedepend >/dev/null 2>&1 && grep 'depend:' "$mkfile" >/dev/null 2>&1; then
  84 -                (cd "$outpath/qmake" && "$MAKE" -f "$mkfile" depend) >/dev/null 2>&1
  85 -                sed 's,^.*/\([^/]*.o\):,\1:,g' "$mkfile" >"$mkfile.tmp"
  86 -                sed "s,$outpath,$adjoutpath,g" "$mkfile.tmp" >"$mkfile"
  87 -                rm "$mkfile.tmp"
  88 -            fi
  89 -        fi
  90 -
  91 -    if [ "$OPT_VERBOSE" = yes ]; then
  92 -        # Show the output of make
  93 -        (cd "$outpath/qmake"; "$MAKE") || exit 2
  94 -    else
  95 -        # Hide the output of make
  96 -        # Use bash to print dots, if we have it, and stdout is a tty.
  97 -        if test -t 1 && $WHICH bash > /dev/null 2>/dev/null; then
  98 -            bash -c 'set -o pipefail
  99 -                cd "$0/qmake"; "$1" | while read line; do
 100 -                    builtin echo -n .
 101 -                done' "$outpath" "$MAKE" || exit 2
 102 -        else
 103 -            (cd "$outpath/qmake"; "$MAKE" -s) || exit 2
 104 -        fi
 105 -        echo "Done."
 106 -    fi
 107 -
 108  #-------------------------------------------------------------------------------
 109  # create a qt.conf for the Qt build tree itself
 110  #-------------------------------------------------------------------------------