summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch')
-rw-r--r--recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch26
1 files changed, 16 insertions, 10 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
index 828f5ea5..95841ce3 100644
--- a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
@@ -1,7 +1,7 @@
1From 237a4b0143d91c0573ecf6f9ff5e37827a14a75d Mon Sep 17 00:00:00 2001 1From e70bd40730582e5e5531fca51a1574cb306c40d3 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 15 Apr 2013 04:29:32 +0200 3Date: Mon, 15 Apr 2013 04:29:32 +0200
4Subject: [PATCH 01/10] Add linux-oe-g++ platform 4Subject: [PATCH 1/8] 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
@@ -42,16 +42,16 @@ Upstream-Status: Inappropriate [embedded specific]
42 42
43Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 43Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
44--- 44---
45 configure | 60 +++++++++++++++------ 45 configure | 66 ++++++++++++++++-------
46 mkspecs/features/configure.prf | 4 +- 46 mkspecs/features/configure.prf | 4 +-
47 mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++ 47 mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++
48 mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ 48 mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++
49 4 files changed, 185 insertions(+), 19 deletions(-) 49 4 files changed, 188 insertions(+), 22 deletions(-)
50 create mode 100644 mkspecs/linux-oe-g++/qmake.conf 50 create mode 100644 mkspecs/linux-oe-g++/qmake.conf
51 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h 51 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
52 52
53diff --git a/configure b/configure 53diff --git a/configure b/configure
54index 55d68ef..bb24a9c 100755 54index d5c2b08..4eae0d3 100755
55--- a/configure 55--- a/configure
56+++ b/configure 56+++ b/configure
57@@ -324,6 +324,16 @@ getQMakeConf() 57@@ -324,6 +324,16 @@ getQMakeConf()
@@ -118,7 +118,7 @@ index 55d68ef..bb24a9c 100755
118 # Use CC/CXX to run config.tests 118 # Use CC/CXX to run config.tests
119 mkdir -p "$outpath/config.tests" 119 mkdir -p "$outpath/config.tests"
120 rm -f "$outpath/config.tests/.qmake.cache" 120 rm -f "$outpath/config.tests/.qmake.cache"
121@@ -3139,7 +3157,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then 121@@ -3140,7 +3158,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then
122 [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no 122 [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no
123 fi 123 fi
124 124
@@ -127,7 +127,7 @@ index 55d68ef..bb24a9c 100755
127 127
128 TEST_COMPILER=$QMAKE_CONF_COMPILER 128 TEST_COMPILER=$QMAKE_CONF_COMPILER
129 129
130@@ -3174,7 +3192,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then 130@@ -3175,7 +3193,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
131 exit 1 131 exit 1
132 fi 132 fi
133 fi 133 fi
@@ -136,7 +136,7 @@ index 55d68ef..bb24a9c 100755
136 136
137 GCC_MACHINE_DUMP= 137 GCC_MACHINE_DUMP=
138 case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac 138 case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac
139@@ -3632,6 +3650,14 @@ setBootstrapVariable() 139@@ -3633,6 +3651,14 @@ setBootstrapVariable()
140 getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" 140 getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
141 } 141 }
142 142
@@ -151,20 +151,26 @@ index 55d68ef..bb24a9c 100755
151 # build qmake 151 # build qmake
152 if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 152 if true; then ###[ '!' -f "$outpath/bin/qmake" ];
153 echo "Creating qmake..." 153 echo "Creating qmake..."
154@@ -3670,11 +3696,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 154@@ -3671,14 +3697,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
155 fi 155 fi
156 156
157 [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= 157 [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
158- setBootstrapVariable QMAKE_CC CC "$CC_TRANSFORM" 158- setBootstrapVariable QMAKE_CC CC "$CC_TRANSFORM"
159- setBootstrapVariable QMAKE_CXX CXX "$CC_TRANSFORM" 159- setBootstrapVariable QMAKE_CXX CXX "$CC_TRANSFORM"
160- setBootstrapVariable QMAKE_CFLAGS 160- setBootstrapVariable QMAKE_CFLAGS
161- setBootstrapVariable QMAKE_CFLAGS_SPLIT_SECTIONS
161- setBootstrapVariable QMAKE_CXXFLAGS 162- setBootstrapVariable QMAKE_CXXFLAGS
163- setBootstrapVariable QMAKE_CXXFLAGS_SPLIT_SECTIONS
162- setBootstrapVariable QMAKE_LFLAGS 164- setBootstrapVariable QMAKE_LFLAGS
165- setBootstrapVariable QMAKE_LFLAGS_GCSECTIONS
163+ setBootstrapEvalVariable QMAKE_CC CC "$CC_TRANSFORM" 166+ setBootstrapEvalVariable QMAKE_CC CC "$CC_TRANSFORM"
164+ setBootstrapEvalVariable QMAKE_CXX CXX "$CC_TRANSFORM" 167+ setBootstrapEvalVariable QMAKE_CXX CXX "$CC_TRANSFORM"
165+ setBootstrapEvalVariable QMAKE_CFLAGS 168+ setBootstrapEvalVariable QMAKE_CFLAGS
169+ setBootstrapEvalVariable QMAKE_CFLAGS_SPLIT_SECTIONS
166+ setBootstrapEvalVariable QMAKE_CXXFLAGS 170+ setBootstrapEvalVariable QMAKE_CXXFLAGS
171+ setBootstrapEvalVariable QMAKE_CXXFLAGS_SPLIT_SECTIONS
167+ setBootstrapEvalVariable QMAKE_LFLAGS 172+ setBootstrapEvalVariable QMAKE_LFLAGS
173+ setBootstrapEvalVariable QMAKE_LFLAGS_GCSECTIONS
168 174
169 if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then 175 if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then
170 setBootstrapVariable QMAKE_CFLAGS_RELEASE 176 setBootstrapVariable QMAKE_CFLAGS_RELEASE
@@ -340,5 +346,5 @@ index 0000000..dd12003
340+ 346+
341+#endif // QPLATFORMDEFS_H 347+#endif // QPLATFORMDEFS_H
342-- 348--
3431.9.1 3492.0.0
344 350
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-18 06:35:08 +0000