The fix to remove "volatile" also applies to the x11 version of Qt, so apply the
patch for both variants by moving it to the common qt4-${PV} include file. This
fixes
that the 32-bit version of qt4-x11 fails to build with the same error as
qt4-embedded.
Signed-off-by: Mike Looijmans <[email protected]>
---
recipes-qt4/qt4/qt4-4.8.7.inc | 1 +
recipes-qt4/qt4/qt4-embedded.inc | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-qt4/qt4/qt4-4.8.7.inc b/recipes-qt4/qt4/qt4-4.8.7.inc
index eea6061..fae7df8 100644
--- a/recipes-qt4/qt4/qt4-4.8.7.inc
+++ b/recipes-qt4/qt4/qt4-4.8.7.inc
@@ -28,6 +28,7 @@ SRC_URI =
"http://download.qt-project.org/archive/qt/4.8/${PV}/qt-everywhere-ope
file://0035-Add-nios2-support.patch \
file://0036-qt-everywhere-opensource-src-4.8.7-gcc6.patch \
file://0037-fix-configure-with-icu60.patch \
+
file://0038-3rdparty-javascriptcore-JITStubs.cpp-allow-builds-of.patch \
file://gcc-version.patch \
file://Fix-QWSLock-invalid-argument-logs.patch \
file://add_check_for_aarch64_32.patch \
diff --git a/recipes-qt4/qt4/qt4-embedded.inc b/recipes-qt4/qt4/qt4-embedded.inc
index 5298d65..9c2d9da 100644
--- a/recipes-qt4/qt4/qt4-embedded.inc
+++ b/recipes-qt4/qt4/qt4-embedded.inc
@@ -12,7 +12,6 @@ QT_BASE_LIB ?= "libqt-embedded"
# Set necessary variables in the profile
SRC_URI += "file://qte.sh \
file://0033-configure-support-c-0x-standard-for-directfd.patch \
-
file://0038-3rdparty-javascriptcore-JITStubs.cpp-allow-builds-of.patch \
"
QT_EMBEDDED_FLAGS ?= " \
--
2.17.1
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
