Openembedded Devel Discussions
 help / color / mirror / Atom feed
* [meta-qt5][krogoth][PATCH] cmake_qt5.bbclass: when using _prepend don't forget to add space at the end
@ 2016-07-28 17:00 Denys Dmytriyenko
  2016-07-28 18:08 ` Martin Jansa
  0 siblings, 1 reply; 3+ messages in thread
From: Denys Dmytriyenko @ 2016-07-28 17:00 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Denys Dmytriyenko

From: Denys Dmytriyenko <denys@ti.com>

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.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 classes/cmake_qt5.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/classes/cmake_qt5.bbclass b/classes/cmake_qt5.bbclass
index 4dc897b..3180fd6 100644
--- a/classes/cmake_qt5.bbclass
+++ b/classes/cmake_qt5.bbclass
@@ -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



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [meta-qt5][krogoth][PATCH] cmake_qt5.bbclass: when using _prepend don't forget to add space at the end
  2016-07-28 17:00 [meta-qt5][krogoth][PATCH] cmake_qt5.bbclass: when using _prepend don't forget to add space at the end Denys Dmytriyenko
@ 2016-07-28 18:08 ` Martin Jansa
  2016-07-28 18:38   ` Denys Dmytriyenko
  0 siblings, 1 reply; 3+ messages in thread
From: Martin Jansa @ 2016-07-28 18:08 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Denys Dmytriyenko

Is the same needed in master branch?

On Thu, Jul 28, 2016 at 7:00 PM, Denys Dmytriyenko <denis@denix.org> wrote:

> From: Denys Dmytriyenko <denys@ti.com>
>
> 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.
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
>  classes/cmake_qt5.bbclass | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/classes/cmake_qt5.bbclass b/classes/cmake_qt5.bbclass
> index 4dc897b..3180fd6 100644
> --- a/classes/cmake_qt5.bbclass
> +++ b/classes/cmake_qt5.bbclass
> @@ -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
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [meta-qt5][krogoth][PATCH] cmake_qt5.bbclass: when using _prepend don't forget to add space at the end
  2016-07-28 18:08 ` Martin Jansa
@ 2016-07-28 18:38   ` Denys Dmytriyenko
  0 siblings, 0 replies; 3+ messages in thread
From: Denys Dmytriyenko @ 2016-07-28 18:38 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Denys Dmytriyenko

On Thu, Jul 28, 2016 at 08:08:35PM +0200, Martin Jansa wrote:
> Is the same needed in master branch?

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

-- 
Denys


> On Thu, Jul 28, 2016 at 7:00 PM, Denys Dmytriyenko <denis@denix.org> wrote:
> 
> > From: Denys Dmytriyenko <denys@ti.com>
> >
> > 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.
> >
> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > ---
> >  classes/cmake_qt5.bbclass | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/classes/cmake_qt5.bbclass b/classes/cmake_qt5.bbclass
> > index 4dc897b..3180fd6 100644
> > --- a/classes/cmake_qt5.bbclass
> > +++ b/classes/cmake_qt5.bbclass
> > @@ -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
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2016-07-28 19:38 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-28 17:00 [meta-qt5][krogoth][PATCH] cmake_qt5.bbclass: when using _prepend don't forget to add space at the end Denys Dmytriyenko
2016-07-28 18:08 ` Martin Jansa
2016-07-28 18:38   ` Denys Dmytriyenko

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox