diff options
-rw-r--r-- | recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch | 83 | ||||
-rw-r--r-- | scripts/manifest.xml | 2 |
2 files changed, 31 insertions, 54 deletions
diff --git a/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch b/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch index 7ce3a9e..ac4fe40 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch | |||
@@ -1,23 +1,25 @@ | |||
1 | From 5363b4d6d1f3c5683267ec3e190b85eca964eef8 Mon Sep 17 00:00:00 2001 | 1 | From 0386cb5f9a46e56a0a94f2a92e87ed52d41cf4ea Mon Sep 17 00:00:00 2001 |
2 | From: David Schulz <david.schulz@theqtcompany.com> | 2 | From: David Schulz <david.schulz@theqtcompany.com> |
3 | Date: Fri, 3 Jul 2015 16:06:59 +0200 | 3 | Date: Fri, 3 Jul 2015 16:06:59 +0200 |
4 | Subject: [PATCH] Add win32-g++-oe mkspec that uses the OE_ environment. | 4 | Subject: [PATCH] Add win32-g++-oe mkspec that uses the OE_ environment. |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [embedded specific] | 6 | Upstream-Status: Inappropriate [embedded specific] |
7 | too OE specific, probably cannot be upstreamed | 7 | too OE specific, probably cannot be upstreamed |
8 | |||
9 | Change-Id: Ic60b32f88ee6a792b0d8938e40e2d6cb19fb93aa | ||
8 | --- | 10 | --- |
9 | mkspecs/win32-g++-oe/qmake.conf | 109 +++++++++++++++++++++++++++++++++++ | 11 | mkspecs/win32-g++-oe/qmake.conf | 87 ++++++++++++++++++++++++++++++++++++ |
10 | mkspecs/win32-g++-oe/qplatformdefs.h | 42 ++++++++++++++ | 12 | mkspecs/win32-g++-oe/qplatformdefs.h | 42 +++++++++++++++++ |
11 | 2 files changed, 151 insertions(+) | 13 | 2 files changed, 129 insertions(+) |
12 | create mode 100644 mkspecs/win32-g++-oe/qmake.conf | 14 | create mode 100644 mkspecs/win32-g++-oe/qmake.conf |
13 | create mode 100644 mkspecs/win32-g++-oe/qplatformdefs.h | 15 | create mode 100644 mkspecs/win32-g++-oe/qplatformdefs.h |
14 | 16 | ||
15 | diff --git a/mkspecs/win32-g++-oe/qmake.conf b/mkspecs/win32-g++-oe/qmake.conf | 17 | diff --git a/mkspecs/win32-g++-oe/qmake.conf b/mkspecs/win32-g++-oe/qmake.conf |
16 | new file mode 100644 | 18 | new file mode 100644 |
17 | index 0000000..1c8879a | 19 | index 0000000..76eefe5 |
18 | --- /dev/null | 20 | --- /dev/null |
19 | +++ b/mkspecs/win32-g++-oe/qmake.conf | 21 | +++ b/mkspecs/win32-g++-oe/qmake.conf |
20 | @@ -0,0 +1,109 @@ | 22 | @@ -0,0 +1,87 @@ |
21 | +# | 23 | +# |
22 | +# qmake configuration for win32-g++ | 24 | +# qmake configuration for win32-g++ |
23 | +# | 25 | +# |
@@ -28,6 +30,7 @@ index 0000000..1c8879a | |||
28 | +# | 30 | +# |
29 | + | 31 | + |
30 | +load(device_config) | 32 | +load(device_config) |
33 | +include(../common/g++-base.conf) | ||
31 | + | 34 | + |
32 | +MAKEFILE_GENERATOR = MINGW | 35 | +MAKEFILE_GENERATOR = MINGW |
33 | +QMAKE_PLATFORM = win32 mingw | 36 | +QMAKE_PLATFORM = win32 mingw |
@@ -38,45 +41,22 @@ index 0000000..1c8879a | |||
38 | +QMAKE_EXT_OBJ = .o | 41 | +QMAKE_EXT_OBJ = .o |
39 | +QMAKE_EXT_RES = _res.o | 42 | +QMAKE_EXT_RES = _res.o |
40 | + | 43 | + |
41 | +QMAKE_COMPILER = $(OE_QMAKE_COMPILER) gcc | 44 | +QMAKE_COMPILER = $$(OE_QMAKE_COMPILER) |
42 | + | 45 | + |
43 | +QMAKE_CC = $(OE_QMAKE_CC) | 46 | +QMAKE_CC = $$(OE_QMAKE_CC) |
44 | +QMAKE_LEX = flex | 47 | +QMAKE_LEX = flex |
45 | +QMAKE_LEXFLAGS = | 48 | +QMAKE_LEXFLAGS = |
46 | +QMAKE_YACC = byacc | 49 | +QMAKE_YACC = bison -y |
47 | +QMAKE_YACCFLAGS = -d | 50 | +QMAKE_YACCFLAGS = -d |
48 | +QMAKE_CFLAGS = -pipe $(OE_QMAKE_CFLAGS) | 51 | +QMAKE_CFLAGS += -fno-keep-inline-dllexport $$(OE_QMAKE_CFLAGS) |
49 | +QMAKE_CFLAGS_DEPS = -M | 52 | +QMAKE_CFLAGS_WARN_ON += -Wextra |
50 | +QMAKE_CFLAGS_WARN_ON = -Wall -Wextra | 53 | +QMAKE_CFLAGS_SSE2 += -mstackrealign |
51 | +QMAKE_CFLAGS_WARN_OFF = -w | 54 | + |
52 | +QMAKE_CFLAGS_RELEASE = -O2 | 55 | +QMAKE_CXX = $$(OE_QMAKE_CXX) |
53 | +QMAKE_CFLAGS_DEBUG = -g | ||
54 | +QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses | ||
55 | +QMAKE_CFLAGS_SPLIT_SECTIONS = -ffunction-sections | ||
56 | +QMAKE_CFLAGS_SSE2 = -msse2 -mstackrealign | ||
57 | +QMAKE_CFLAGS_SSE3 = -msse3 | ||
58 | +QMAKE_CFLAGS_SSSE3 = -mssse3 | ||
59 | +QMAKE_CFLAGS_SSE4_1 = -msse4.1 | ||
60 | +QMAKE_CFLAGS_SSE4_2 = -msse4.2 | ||
61 | +QMAKE_CFLAGS_AVX = -mavx | ||
62 | +QMAKE_CFLAGS_AVX2 = -mavx2 | ||
63 | +QMAKE_CFLAGS_NEON = -mfpu=neon | ||
64 | + | ||
65 | +QMAKE_CXX = $(OE_QMAKE_CXX) | ||
66 | +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) | ||
67 | +QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS | ||
68 | +QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON | ||
69 | +QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF | ||
70 | +QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE | ||
71 | +QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG | ||
72 | +QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC | ||
73 | +QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD | 56 | +QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD |
74 | +QMAKE_CXXFLAGS_RTTI_ON = -frtti | 57 | +QMAKE_CXXFLAGS_RTTI_ON = -frtti |
75 | +QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti | 58 | +QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti |
76 | +QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads | 59 | +QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads |
77 | +QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions | ||
78 | +QMAKE_CXXFLAGS_CXX11 = -std=c++0x | ||
79 | +QMAKE_CXXFLAGS_SPLIT_SECTIONS = $$QMAKE_CFLAGS_SPLIT_SECTIONS | ||
80 | + | 60 | + |
81 | +QMAKE_INCDIR = | 61 | +QMAKE_INCDIR = |
82 | + | 62 | + |
@@ -85,19 +65,15 @@ index 0000000..1c8879a | |||
85 | +QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src | 65 | +QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src |
86 | +QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | 66 | +QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< |
87 | + | 67 | + |
88 | +QMAKE_LINK = $(OE_QMAKE_LINK) | 68 | +QMAKE_LINK = $$(OE_QMAKE_LINK) |
89 | +QMAKE_LINK_C = $(OE_QMAKE_LINK) | 69 | +QMAKE_LINK_C = $$(OE_QMAKE_LINK) |
90 | +QMAKE_LFLAGS = $(OE_QMAKE_LDFLAGS) | 70 | +QMAKE_LFLAGS = $$(OE_QMAKE_LDFLAGS) |
91 | +QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads | 71 | +QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads |
92 | +QMAKE_LFLAGS_EXCEPTIONS_OFF = | ||
93 | +QMAKE_LFLAGS_RELEASE = -Wl,-s | 72 | +QMAKE_LFLAGS_RELEASE = -Wl,-s |
94 | +QMAKE_LFLAGS_DEBUG = | ||
95 | +QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console | 73 | +QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console |
96 | +QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows | 74 | +QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows |
97 | +QMAKE_LFLAGS_DLL = -shared | 75 | +QMAKE_LFLAGS_DLL = -shared |
98 | +QMAKE_LFLAGS_CXX11 = | ||
99 | +QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections | 76 | +QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections |
100 | +QMAKE_LFLAGS_USE_GOLD = -fuse-ld=gold | ||
101 | +QMAKE_LINK_OBJECT_MAX = 10 | 77 | +QMAKE_LINK_OBJECT_MAX = 10 |
102 | +QMAKE_LINK_OBJECT_SCRIPT = object_script | 78 | +QMAKE_LINK_OBJECT_SCRIPT = object_script |
103 | +QMAKE_PREFIX_SHLIB = | 79 | +QMAKE_PREFIX_SHLIB = |
@@ -111,21 +87,25 @@ index 0000000..1c8879a | |||
111 | +QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 | 87 | +QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 |
112 | +QMAKE_LIBS_NETWORK = -lws2_32 | 88 | +QMAKE_LIBS_NETWORK = -lws2_32 |
113 | +QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 | 89 | +QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 |
114 | +QMAKE_LIBS_OPENGL_ES2 = -llibEGL -llibGLESv2 -lgdi32 -luser32 | 90 | +QMAKE_LIBS_OPENGL_ES2 = -lgdi32 -luser32 |
115 | +QMAKE_LIBS_OPENGL_ES2_DEBUG = -llibEGLd -llibGLESv2d -lgdi32 -luser32 | 91 | +QMAKE_LIBS_OPENGL_ES2_DEBUG = -lgdi32 -luser32 |
116 | +QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32 | 92 | +QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32 |
117 | +QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain | 93 | +QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain |
118 | + | 94 | + |
119 | +QMAKE_IDL = midl | 95 | +QMAKE_IDL = midl |
120 | +QMAKE_LIB = $(OE_QMAKE_AR) -ru | 96 | +QMAKE_LIB = $$(OE_QMAKE_AR) -rc |
121 | +QMAKE_RC = $(RC) | 97 | +QMAKE_RC = $$(RC) |
122 | + | 98 | + |
123 | +QMAKE_STRIP = $${OE_QMAKE_STRIP} | 99 | +QMAKE_STRIP = $$(OE_QMAKE_STRIP) |
124 | +QMAKE_STRIPFLAGS_LIB += --strip-unneeded | 100 | +QMAKE_STRIPFLAGS_LIB += --strip-unneeded |
125 | +QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy | 101 | +QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy |
126 | +QMAKE_NM = $${CROSS_COMPILE}nm -P | 102 | +QMAKE_NM = $${CROSS_COMPILE}nm -P |
127 | + | 103 | + |
128 | +isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG) | 104 | +isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG) |
105 | + | ||
106 | +include(../common/angle.conf) | ||
107 | +include(../common/gcc-base.conf) | ||
108 | + | ||
129 | +load(qt_config) | 109 | +load(qt_config) |
130 | diff --git a/mkspecs/win32-g++-oe/qplatformdefs.h b/mkspecs/win32-g++-oe/qplatformdefs.h | 110 | diff --git a/mkspecs/win32-g++-oe/qplatformdefs.h b/mkspecs/win32-g++-oe/qplatformdefs.h |
131 | new file mode 100644 | 111 | new file mode 100644 |
@@ -175,6 +155,3 @@ index 0000000..9d63527 | |||
175 | +****************************************************************************/ | 155 | +****************************************************************************/ |
176 | + | 156 | + |
177 | +#include "../win32-g++/qplatformdefs.h" | 157 | +#include "../win32-g++/qplatformdefs.h" |
178 | -- | ||
179 | 1.9.1 | ||
180 | |||
diff --git a/scripts/manifest.xml b/scripts/manifest.xml index e645613..2a10f3c 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml | |||
@@ -24,7 +24,7 @@ | |||
24 | path="sources/meta-openembedded"/> | 24 | path="sources/meta-openembedded"/> |
25 | <project name="meta-qt5" | 25 | <project name="meta-qt5" |
26 | remote="qtyocto" | 26 | remote="qtyocto" |
27 | revision="f54f8401b268cb50d2f270e2da88d07c1c5e4148" | 27 | revision="a429f4f8ef5142201b6bd978e598b1976428762b" |
28 | path="sources/meta-qt5"/> | 28 | path="sources/meta-qt5"/> |
29 | <project name="meta-mingw" | 29 | <project name="meta-mingw" |
30 | remote="qtyocto" | 30 | remote="qtyocto" |