Skip to contentSkip to conversation

cmake_qt5.bbclass: when using _prepend don't forget to add space at the end

PATCH In review Denys Dmytriyenko 2 participants 3 messages Jul 28, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cmake_qt5.bbclass: when using _prepend don't forget to add space at the end

From: Denys Dmytriyenko <[email protected]>

Previous commit aacd63f10dd58acf7bf6138e2f4734e37dcf0420 introduced a bug by using _prepend w/o a space at the end, resulting in corrupted EXTRA_OEMAKE variable in packages that inherit cmake_qt5.bbclass.

---
 classes/cmake_qt5.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
classes/cmake_qt5.bbclass +2 -1
index 4dc897b..3180fd6 100644
@@ -32,4 +32,5 @@ EXTRA_OECMAKE_prepend = " \
     -DOE_QMAKE_PATH_QT_DOCS=${OE_QMAKE_PATH_QT_DOCS} \
     -DOE_QMAKE_PATH_QT_SETTINGS=${OE_QMAKE_PATH_QT_SETTINGS} \
     -DOE_QMAKE_PATH_QT_EXAMPLES=${OE_QMAKE_PATH_QT_EXAMPLES} \
-    -DOE_QMAKE_PATH_QT_TESTS=${OE_QMAKE_PATH_QT_TESTS}"
+    -DOE_QMAKE_PATH_QT_TESTS=${OE_QMAKE_PATH_QT_TESTS} \
+"
Signature · 1 line
2.7.4
#1 lore raw

Is the same needed in master branch?

Quoted 32 lines · Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

Previous commit aacd63f10dd58acf7bf6138e2f4734e37dcf0420 introduced a bug by
using _prepend w/o a space at the end, resulting in corrupted EXTRA_OEMAKE variable in packages that inherit cmake_qt5.bbclass.

---
 classes/cmake_qt5.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
classes/cmake_qt5.bbclass +2 -2
index 4dc897b..3180fd6 100644
@@ -32,4 +32,5 @@ EXTRA_OECMAKE_prepend = " \
     -DOE_QMAKE_PATH_QT_DOCS=${OE_QMAKE_PATH_QT_DOCS} \
     -DOE_QMAKE_PATH_QT_SETTINGS=${OE_QMAKE_PATH_QT_SETTINGS} \
     -DOE_QMAKE_PATH_QT_EXAMPLES=${OE_QMAKE_PATH_QT_EXAMPLES} \
-    -DOE_QMAKE_PATH_QT_TESTS=${OE_QMAKE_PATH_QT_TESTS}"
+    -DOE_QMAKE_PATH_QT_TESTS=${OE_QMAKE_PATH_QT_TESTS} \
+"
--

2.7.4

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#2 lore raw
Quoted 1 line · Martin Jansa

Is the same needed in master branch?

Yes, just sent separately - had to update commit id, as I used the one from krogoth below...

Signature · 1 line
Denys
Quoted 39 lines · Denys Dmytriyenko
Quoted 33 lines

From: Denys Dmytriyenko <[email protected]>

Previous commit aacd63f10dd58acf7bf6138e2f4734e37dcf0420 introduced a bug by
using _prepend w/o a space at the end, resulting in corrupted EXTRA_OEMAKE variable in packages that inherit cmake_qt5.bbclass.

---
 classes/cmake_qt5.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
classes/cmake_qt5.bbclass +2 -2
index 4dc897b..3180fd6 100644
@@ -32,4 +32,5 @@ EXTRA_OECMAKE_prepend = " \
     -DOE_QMAKE_PATH_QT_DOCS=${OE_QMAKE_PATH_QT_DOCS} \
     -DOE_QMAKE_PATH_QT_SETTINGS=${OE_QMAKE_PATH_QT_SETTINGS} \
     -DOE_QMAKE_PATH_QT_EXAMPLES=${OE_QMAKE_PATH_QT_EXAMPLES} \
-    -DOE_QMAKE_PATH_QT_TESTS=${OE_QMAKE_PATH_QT_TESTS}"
+    -DOE_QMAKE_PATH_QT_TESTS=${OE_QMAKE_PATH_QT_TESTS} \
+"
--

2.7.4

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Signature · 4 lines
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel