diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-04-16 13:15:26 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-18 12:07:34 +0200 |
commit | 18741e483851e1a6aae79992b130aee34ad48879 (patch) | |
tree | c6523af371af79a48d726578217d6b3b1570beb0 /recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | |
parent | d2c05c81e8230358dca80cf9df67e49f9f672a29 (diff) | |
download | meta-qt5-18741e483851e1a6aae79992b130aee34ad48879.tar.gz |
recipes-git: upgrade to 5.5
* based on my WIP patch + fixes from John Mullen
* I was trying to get rhid of 0003-Add-external-hostbindir-option.patch
and 0010-Add-external-hostbindir-option-for-native-sdk.patch by using
upstream configure parameter added in some previous version, but I've
failed, so now good-old -external-hostbindir parameter is back
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 0f6bcbe7..1997d0db 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From ec414ca0df1ec459b5abd753cf0d730572715e17 Mon Sep 17 00:00:00 2001 | 1 | From b8b9732948ede2b27304eed7f1d78aed16a4eeb7 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 | 3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 |
4 | Subject: [PATCH 01/12] Add linux-oe-g++ platform | 4 | Subject: [PATCH 1/7] Add linux-oe-g++ platform |
5 | 5 | ||
6 | * This qmake.conf unlike other platforms reads most variables from | 6 | * This qmake.conf unlike other platforms reads most variables from |
7 | shell environment, because it's easier for qt recipes to export | 7 | shell environment, because it's easier for qt recipes to export |
@@ -43,19 +43,19 @@ Upstream-Status: Inappropriate [embedded specific] | |||
43 | Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c | 43 | Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c |
44 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 44 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
45 | --- | 45 | --- |
46 | configure | 66 ++++++++++++++++------- | 46 | configure | 70 +++++++++++++++--------- |
47 | mkspecs/features/configure.prf | 4 +- | 47 | mkspecs/features/configure.prf | 4 +- |
48 | mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++ | 48 | mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++ |
49 | mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ | 49 | mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ |
50 | 4 files changed, 188 insertions(+), 22 deletions(-) | 50 | 4 files changed, 186 insertions(+), 28 deletions(-) |
51 | create mode 100644 mkspecs/linux-oe-g++/qmake.conf | 51 | create mode 100644 mkspecs/linux-oe-g++/qmake.conf |
52 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h | 52 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h |
53 | 53 | ||
54 | diff --git a/configure b/configure | 54 | diff --git a/configure b/configure |
55 | index 6ce6753..0a00d6d 100755 | 55 | index 7251e8e..8093782 100755 |
56 | --- a/configure | 56 | --- a/configure |
57 | +++ b/configure | 57 | +++ b/configure |
58 | @@ -316,6 +316,16 @@ getQMakeConf() | 58 | @@ -342,6 +342,16 @@ getQMakeConf() |
59 | getSingleQMakeVariable "$1" "$specvals" | 59 | getSingleQMakeVariable "$1" "$specvals" |
60 | } | 60 | } |
61 | 61 | ||
@@ -72,7 +72,7 @@ index 6ce6753..0a00d6d 100755 | |||
72 | getXQMakeConf() | 72 | getXQMakeConf() |
73 | { | 73 | { |
74 | if [ -z "$xspecvals" ]; then | 74 | if [ -z "$xspecvals" ]; then |
75 | @@ -325,6 +335,16 @@ getXQMakeConf() | 75 | @@ -351,6 +361,16 @@ getXQMakeConf() |
76 | getSingleQMakeVariable "$1" "$xspecvals" | 76 | getSingleQMakeVariable "$1" "$xspecvals" |
77 | } | 77 | } |
78 | 78 | ||
@@ -89,37 +89,38 @@ index 6ce6753..0a00d6d 100755 | |||
89 | compilerSupportsFlag() | 89 | compilerSupportsFlag() |
90 | { | 90 | { |
91 | cat >conftest.cpp <<EOF | 91 | cat >conftest.cpp <<EOF |
92 | @@ -541,21 +561,19 @@ fi | 92 | @@ -564,24 +584,14 @@ fi |
93 | # initalize variables | 93 | # initalize variables |
94 | #------------------------------------------------------------------------------- | 94 | #------------------------------------------------------------------------------- |
95 | 95 | ||
96 | -SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" | 96 | -SYSTEM_VARIABLES="AR RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" |
97 | -for varname in $SYSTEM_VARIABLES; do | 97 | -for varname in $SYSTEM_VARIABLES; do |
98 | +# Export all OE variables for qmake.conf from shell env to QMakeVars | 98 | +# Export all OE variables for qmake.conf from shell env to QMakeVars |
99 | +OE_VARIABLES="AR CC CFLAGS COMPILER CXX CXXFLAGS LDFLAGS LINK QT_CONFIG STRIP" | 99 | +OE_VARIABLES="AR CC CFLAGS COMPILER CXX CXXFLAGS LDFLAGS LINK QT_CONFIG STRIP" |
100 | +for varname in $OE_VARIABLES; do | 100 | +for varname in $OE_VARIABLES; do |
101 | qmakevarname="${varname}" | 101 | qmakevarname="${varname}" |
102 | - qmakecmdargs="" | ||
102 | - # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS | 103 | - # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS |
103 | - if [ "${varname}" = "LDFLAGS" ]; then | 104 | - if [ "${varname}" = "LDFLAGS" ]; then |
104 | - qmakevarname="LFLAGS" | 105 | - qmakevarname="LFLAGS" |
105 | - elif [ "${varname}" = "LD" ]; then | 106 | - elif [ "${varname}" = "LD" ]; then |
106 | - qmakevarname="LINK" | 107 | - qmakevarname="LINK" |
108 | - elif [ "${varname}" = "AR" ]; then | ||
109 | - # QMAKE_AR needs to be set to "/path/to/ar cqs" but the | ||
110 | - # environment variable will be set to the command only so we | ||
111 | - # need to append " cqs" for autoconf compatibility | ||
112 | - qmakecmdargs=" cqs" | ||
107 | - fi | 113 | - fi |
108 | cmd=`echo \ | 114 | cmd=`echo \ |
109 | -'if [ -n "\$'${varname}'" ]; then | 115 | -'if [ -n "\$'${varname}'" ]; then |
110 | - QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'" | 116 | - QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}${qmakecmdargs}'" |
111 | +'if [ -n "\$OE_QMAKE_'${varname}'" ]; then | 117 | +'if [ -n "\$OE_QMAKE_'${varname}'" ]; then |
112 | + QMakeVar set OE_QMAKE_'${qmakevarname}' "\$OE_QMAKE_'${varname}'" | 118 | + QMakeVar set OE_QMAKE_'${qmakevarname}' "\$OE_QMAKE_'${varname}'" |
113 | +# echo "Exporting OE_QMAKE_'${qmakevarname}' value=\"\$OE_QMAKE_'${varname}'\"" >&2 | 119 | +# echo "Exporting OE_QMAKE_'${qmakevarname}' value=\"\$OE_QMAKE_'${varname}'\"" >&2 |
114 | fi'` | 120 | fi'` |
115 | eval "$cmd" | 121 | eval "$cmd" |
116 | done | 122 | done |
117 | + | 123 | @@ -3335,7 +3345,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then |
118 | +SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" | ||
119 | # Use CC/CXX to run config.tests | ||
120 | mkdir -p "$outpath/config.tests" | ||
121 | rm -f "$outpath/config.tests/.qmake.cache" | ||
122 | @@ -3178,7 +3196,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then | ||
123 | [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no | 124 | [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no |
124 | fi | 125 | fi |
125 | 126 | ||
@@ -128,7 +129,7 @@ index 6ce6753..0a00d6d 100755 | |||
128 | 129 | ||
129 | TEST_COMPILER=$QMAKE_CONF_COMPILER | 130 | TEST_COMPILER=$QMAKE_CONF_COMPILER |
130 | 131 | ||
131 | @@ -3216,7 +3234,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then | 132 | @@ -3392,7 +3402,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then |
132 | exit 1 | 133 | exit 1 |
133 | fi | 134 | fi |
134 | fi | 135 | fi |
@@ -137,7 +138,7 @@ index 6ce6753..0a00d6d 100755 | |||
137 | 138 | ||
138 | GCC_MACHINE_DUMP= | 139 | GCC_MACHINE_DUMP= |
139 | case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac | 140 | case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac |
140 | @@ -3687,6 +3705,14 @@ setBootstrapVariable() | 141 | @@ -3894,6 +3904,14 @@ setBootstrapVariable() |
141 | getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" | 142 | getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" |
142 | } | 143 | } |
143 | 144 | ||
@@ -152,7 +153,7 @@ index 6ce6753..0a00d6d 100755 | |||
152 | # build qmake | 153 | # build qmake |
153 | if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 154 | if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
154 | echo "Creating qmake..." | 155 | echo "Creating qmake..." |
155 | @@ -3725,14 +3751,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 156 | @@ -3932,14 +3950,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
156 | fi | 157 | fi |
157 | 158 | ||
158 | [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= | 159 | [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= |