Skip to contentSkip to conversation

layer.conf: Use immediate expansion

PATCH In review Khem Raj 2 participants 4 messages May 18, 2016 – May 19, 2016

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 layer.conf: Use immediate expansion

Matches most of layers defaults

Signed-off-by Khem Raj <[email protected]>
---
 conf/layer.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
conf/layer.conf +1 -1
index 62ce9cc..39c2421 100644
@@ -5,6 +5,6 @@ BBPATH .= ":${LAYERDIR}"
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb"
 
 BBFILE_COLLECTIONS += "qt4-layer"
-BBFILE_PATTERN_qt4-layer = "^${LAYERDIR}/"
+BBFILE_PATTERN_qt4-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_qt4-layer = "6"
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 2/2 qt4: Fix build with gcc-6

Signed-off-by Khem Raj <[email protected]>
---
 recipes-qt4/qt4/qt4-4.8.7.inc                      |  4 ++++
 ...6-qt-everywhere-opensource-src-4.8.7-gcc6.patch | 24 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 recipes-qt4/qt4/qt4-4.8.7/0036-qt-everywhere-opensource-src-4.8.7-gcc6.patch
recipes-qt4/qt4/qt4-4.8.7.inc +4 -0
index 9720605..aa4f73c 100644
@@ -26,6 +26,7 @@ SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever
            file://0032-aarch64_add_header.patch \
            file://0034-Fix-kmap2qmap-build-with-clang.patch \
            file://0035-Add-nios2-support.patch \
+           file://0036-qt-everywhere-opensource-src-4.8.7-gcc6.patch \
            file://Fix-QWSLock-invalid-argument-logs.patch \
            file://add_check_for_aarch64_32.patch \
            file://g++.conf \

@@ -41,6 +42,9 @@ UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
 
 S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
 
+# workaround for class std::auto_ptr' is deprecated with gcc-6
+CXXFLAGS += "-std=gnu++98 -Wno-deprecated"
+
 # disable webkit for mips64 n32 temporarily that fails to compile,
 # qt upstream defect:
 # https://bugreports.qt-project.org/browse/QTBUG-39224
recipes-qt4/qt4/qt4-4.8.7/0036-qt-everywhere-opensource-src-4.8.7-gcc6.patch new file +24 -0
new file mode 100644
index 0000000..6e0f18d
@@ -0,0 +1,24 @@
+Avoid implicit conversions, which are now flagged by gcc6
+
+| api/qcoloroutput_p.h:74:60: error: shift expression '(1048575 << 20)' overflows [-fpermissive]
+| api/qcoloroutput_p.h:74:63: error: enumerator value for 'BackgroundMask' is not an integer constant
+|              BackgroundMask  = ((1 << BackgroundShift) - 1) << BackgroundShift
+
+
+Upstream-Status: Inappropriate [Frozen upstream]
+Signed-off-by: Khem Raj <[email protected]>
+
+diff -up qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.than qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h
+--- qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.than	2016-02-03 11:43:04.567757448 +0100
++++ qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h	2016-02-04 13:12:26.394350271 +0100
+@@ -70,8 +70,8 @@ namespace QPatternist
+             ForegroundShift = 10,
+             BackgroundShift = 20,
+             SpecialShift    = 20,
+-            ForegroundMask  = ((1 << ForegroundShift) - 1) << ForegroundShift,
+-            BackgroundMask  = ((1 << BackgroundShift) - 1) << BackgroundShift
++            ForegroundMask  = 0x1f << ForegroundShift,
++            BackgroundMask  = 0x7 << BackgroundShift
+         };
+ 
+     public:
Signature · 1 line
1.9.1
#2 lore raw
In reply to Khem Raj
Quoted 12 lines · Khem Raj

Matches most of layers defaults

Signed-off-by Khem Raj <[email protected]>
---
 conf/layer.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
conf/layer.conf +0 -0
index 62ce9cc..39c2421 100644

conf/layer.conf BBPATH .= ":${LAYERDIR}" · line 8

Quoted 5 lines
conf/layer.conf +1 -1
@@ -5,6 +5,6 @@ BBPATH .= ":${LAYERDIR}"
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb"
 
 BBFILE_COLLECTIONS += "qt4-layer"
-BBFILE_PATTERN_qt4-layer = "^${LAYERDIR}/"
+BBFILE_PATTERN_qt4-layer := "^${LAYERDIR}/"

This is really strange. ${LAYERDIR} always immediate expands. So there should be no ifferences between the two.

--Mark

Quoted 3 lines
conf/layer.conf +0 -0
 BBFILE_PRIORITY_qt4-layer = "6"
author
#3 lore raw
Quoted 18 lines · Mark Hatle
Quoted 14 lines · Khem Raj

Matches most of layers defaults

Signed-off-by Khem Raj <[email protected]>

---
conf/layer.conf | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
conf/layer.conf +0 -0
index 62ce9cc..39c2421 100644
@@ -5,6 +5,6 @@ BBPATH .= ":${LAYERDIR}"

BBFILES += "${LAYERDIR}/recipes-*/*/*.bb"

Quoted 7 lines

conf/layer.conf BBPATH .= ":${LAYERDIR}" · line 8

Quoted 3 lines

BBFILE_COLLECTIONS += "qt4-layer"

conf/layer.conf +1 -1
-BBFILE_PATTERN_qt4-layer = "^${LAYERDIR}/"
+BBFILE_PATTERN_qt4-layer := "^${LAYERDIR}/"

This is really strange. ${LAYERDIR} always immediate expands. So there should be no ifferences between the two.

As I said, I was just matching to some other layers conventions functionally it works either way

Quoted 6 lines

--Mark

Quoted 3 lines

BBFILE_PRIORITY_qt4-layer = "6"