Mercurial > mxe-octave

comparison src/qt-1-cherrypicks.patch @ 4305:17f36188049d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use -no-pch for qt build (from MXE project).
author John W. Eaton <jwe@octave.org>
date Sat, 31 Dec 2016 09:01:24 -0500
parents e576d2d5ae70
children
comparison
equal deleted inserted replaced
4304:0db33a326eec 4305:17f36188049d
80667 if ! compileTest unix/ipc_sysv "ipc_sysv" ; then 80667 if ! compileTest unix/ipc_sysv "ipc_sysv" ; then
80668 # SYSV IPC is not supported - check POSIX IPC 80668 # SYSV IPC is not supported - check POSIX IPC
80669 -- 80669 --
80670 2.1.4 80670 2.1.4
80671 80671
80672
80673 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
80674 From: James McDonnell <jmcdonnell@qnx.com>
80675 Date: Thu, 14 Apr 2016 16:48:15 -0400
80676 Subject: [PATCH] Ensure -no-pch is effective
80677
80678 Have configure add a "CONFIG -= precompile_header" to qmodule.pri when
80679 -no-pch is specified. Ensures that Qt is built without precompiled
80680 headers (as requested) even if allowing precompiled header use is the
80681 default for the toolchain.
80682
80683 Parallels changes to Windows configure.
80684
80685 Task-number: QTBUG-11545
80686 Change-Id: Iab4021e74c4e9978770e917dff97b976c449dd8b
80687 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
80688
80689 The patch was backported from Qt 5.7.0
80690 Commit in qtbase git: 7c1326a1c390bb15eaa164f748c947f1df9f542d
80691
80692 diff --git a/configure b/configure
80693 index 1111111..2222222 100755
80694 --- a/configure
80695 +++ b/configure
80696 @@ -64,6 +64,7 @@ fi
80697 OPT_CMDLINE=`echo $@ | sed "s,-v ,,g; s,-v$,,g"`
80698
80699 # initialize global variables
80700 +CONFIG_SEPARATORS=`printf ' \t'`
80701 QMAKE_SWITCHES=
80702 QMAKE_VARS=
80703 QMAKE_CONFIG=
80704 @@ -201,6 +202,21 @@ getXQMakeConf()
80705 getQMakeConf3 "$1" "$xspecvals"
80706 }
80707
80708 +testXConfig()
80709 +{
80710 + # Put a space on each end of the CONFIG value so that searching for the
80711 + # target with whitespace on either side will work even when it's the
80712 + # first/last/only item in the CONFIG value.
80713 + case \ `getXQMakeConf CONFIG`\ in
80714 + *[${CONFIG_SEPARATORS}]$1[${CONFIG_SEPARATORS}]*)
80715 + return 0
80716 + ;;
80717 + *)
80718 + return 1
80719 + ;;
80720 + esac
80721 +}
80722 +
80723 compilerSupportsFlag()
80724 {
80725 cat >conftest.cpp <<EOF
80726 @@ -7410,7 +7426,11 @@ fi
80727 [ "$CFG_REDUCE_EXPORTS" = "yes" ] && QT_CONFIG="$QT_CONFIG reduce_exports"
80728 [ "$CFG_STACK_PROTECTOR_STRONG" = "yes" ] && QT_CONFIG="$QT_CONFIG stack-protector-strong"
80729 [ "$CFG_REDUCE_RELOCATIONS" = "yes" ] && QT_CONFIG="$QT_CONFIG reduce_relocations"
80730 -[ "$CFG_PRECOMPILE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG precompile_header"
80731 +if testXConfig precompile_header; then
80732 + [ "$CFG_PRECOMPILE" = "no" ] && QMakeVar del CONFIG precompile_header
80733 +else
80734 + [ "$CFG_PRECOMPILE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG precompile_header"
80735 +fi
80736 if [ "$CFG_SEPARATE_DEBUG_INFO" = "yes" ]; then
80737 QMakeVar add QMAKE_CFLAGS -g
80738 QMakeVar add QMAKE_CXXFLAGS -g