Skip to contentSkip to conversation

qt4: Apply build fix for GCC8 to both x11 and embedded variants

PATCH New Mike Looijmans 1 participant 1 message Dec 6, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qt4: Apply build fix for GCC8 to both x11 and embedded variants

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.

---
 recipes-qt4/qt4/qt4-4.8.7.inc    | 1 +
 recipes-qt4/qt4/qt4-embedded.inc | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
recipes-qt4/qt4/qt4-4.8.7.inc +1 -0
index eea6061..fae7df8 100644
@@ -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 \
recipes-qt4/qt4/qt4-embedded.inc +0 -1
index 5298d65..9c2d9da 100644
@@ -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 ?= " \
Signature · 1 line
2.17.1