Patchwork [meta-qt5,1/4] qmake5_base.bbclass: Use Qt version path for headers

login
register
mail settings
Submitter Otavio Salvador
Date Feb. 21, 2014, 8:41 p.m.
Message ID <1393015264-8343-1-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/67125/
State Changes Requested, archived
Delegated to: Otavio Salvador
Headers show

Comments

Otavio Salvador - Feb. 21, 2014, 8:41 p.m.
When looking for Qt5 headers we ought to use the Qt5 specific path. In
case the distribution wants to have a flat tree it can set QT_DIR_NAME
and it will still works as expected.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 classes/qmake5_base.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Denys Dmytriyenko - Feb. 21, 2014, 9:12 p.m.
On Fri, Feb 21, 2014 at 05:41:01PM -0300, Otavio Salvador wrote:
> When looking for Qt5 headers we ought to use the Qt5 specific path. In
> case the distribution wants to have a flat tree it can set QT_DIR_NAME
> and it will still works as expected.
> 
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

Acked-by: Denys Dmytriyenko <denys@ti.com>

Martin,

Thinking about what you said in that Wiki section - I believe the number of 
apps consuming headers from /usr/include/qt5 is much higher than number of 
non-Qt5 libs/modules potentially installing headers in there... So, we 
shouldn't require every app recipe to set PATH_HEADERS properly.


> ---
>  classes/qmake5_base.bbclass |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
> index 3861cd0..0cfb5a4 100644
> --- a/classes/qmake5_base.bbclass
> +++ b/classes/qmake5_base.bbclass
> @@ -57,7 +57,7 @@ do_generate_qt_config_file() {
>      cat > ${QT_CONF_PATH} <<EOF
>  [Paths]
>  Prefix = ${OE_QMAKE_PATH_PREFIX}
> -Headers = ${OE_QMAKE_PATH_HEADERS}
> +Headers = ${OE_QMAKE_PATH_QT_HEADERS}
>  Libraries = ${OE_QMAKE_PATH_LIBS}
>  ArchData = ${OE_QMAKE_PATH_ARCHDATA}
>  Data = ${OE_QMAKE_PATH_DATA}
> -- 
> 1.7.10.4
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Otavio Salvador - Feb. 21, 2014, 9:48 p.m.
On Fri, Feb 21, 2014 at 6:12 PM, Denys Dmytriyenko <denis@denix.org> wrote:
> On Fri, Feb 21, 2014 at 05:41:01PM -0300, Otavio Salvador wrote:
>> When looking for Qt5 headers we ought to use the Qt5 specific path. In
>> case the distribution wants to have a flat tree it can set QT_DIR_NAME
>> and it will still works as expected.
>>
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>
> Acked-by: Denys Dmytriyenko <denys@ti.com>
>
> Martin,
>
> Thinking about what you said in that Wiki section - I believe the number of
> apps consuming headers from /usr/include/qt5 is much higher than number of
> non-Qt5 libs/modules potentially installing headers in there... So, we
> shouldn't require every app recipe to set PATH_HEADERS properly.

I agree with Denys here.
Martin Jansa - Feb. 22, 2014, 6:37 a.m.
On Fri, Feb 21, 2014 at 04:12:07PM -0500, Denys Dmytriyenko wrote:
> On Fri, Feb 21, 2014 at 05:41:01PM -0300, Otavio Salvador wrote:
> > When looking for Qt5 headers we ought to use the Qt5 specific path. In
> > case the distribution wants to have a flat tree it can set QT_DIR_NAME
> > and it will still works as expected.
> > 
> > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> 
> Acked-by: Denys Dmytriyenko <denys@ti.com>
> 
> Martin,
> 
> Thinking about what you said in that Wiki section - I believe the number of 
> apps consuming headers from /usr/include/qt5 is much higher than number of 
> non-Qt5 libs/modules potentially installing headers in there... So, we 
> shouldn't require every app recipe to set PATH_HEADERS properly.

Setting OE_QMAKE_PATH_HEADERS is simple oneline change:
OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}"

undoing this implementation isn't, if you really want to change
OE_QMAKE_PATH_HEADERS then include QT_DIR_NAME in it, but leave
OE_QMAKE_PATH_QT_HEADERS alone.

> >  classes/qmake5_base.bbclass |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
> > index 3861cd0..0cfb5a4 100644
> > --- a/classes/qmake5_base.bbclass
> > +++ b/classes/qmake5_base.bbclass
> > @@ -57,7 +57,7 @@ do_generate_qt_config_file() {
> >      cat > ${QT_CONF_PATH} <<EOF
> >  [Paths]
> >  Prefix = ${OE_QMAKE_PATH_PREFIX}
> > -Headers = ${OE_QMAKE_PATH_HEADERS}
> > +Headers = ${OE_QMAKE_PATH_QT_HEADERS}
> >  Libraries = ${OE_QMAKE_PATH_LIBS}
> >  ArchData = ${OE_QMAKE_PATH_ARCHDATA}
> >  Data = ${OE_QMAKE_PATH_DATA}
> > -- 
> > 1.7.10.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
Otavio Salvador - Feb. 23, 2014, 1:45 p.m.
On Sat, Feb 22, 2014 at 3:37 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Fri, Feb 21, 2014 at 04:12:07PM -0500, Denys Dmytriyenko wrote:
>> On Fri, Feb 21, 2014 at 05:41:01PM -0300, Otavio Salvador wrote:
>> > When looking for Qt5 headers we ought to use the Qt5 specific path. In
>> > case the distribution wants to have a flat tree it can set QT_DIR_NAME
>> > and it will still works as expected.
>> >
>> > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>>
>> Acked-by: Denys Dmytriyenko <denys@ti.com>
>>
>> Martin,
>>
>> Thinking about what you said in that Wiki section - I believe the number of
>> apps consuming headers from /usr/include/qt5 is much higher than number of
>> non-Qt5 libs/modules potentially installing headers in there... So, we
>> shouldn't require every app recipe to set PATH_HEADERS properly.
>
> Setting OE_QMAKE_PATH_HEADERS is simple oneline change:
> OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}"
>
> undoing this implementation isn't, if you really want to change
> OE_QMAKE_PATH_HEADERS then include QT_DIR_NAME in it, but leave
> OE_QMAKE_PATH_QT_HEADERS alone.

Ok; I will rework the patches and send a v2.

Patch

diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index 3861cd0..0cfb5a4 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -57,7 +57,7 @@  do_generate_qt_config_file() {
     cat > ${QT_CONF_PATH} <<EOF
 [Paths]
 Prefix = ${OE_QMAKE_PATH_PREFIX}
-Headers = ${OE_QMAKE_PATH_HEADERS}
+Headers = ${OE_QMAKE_PATH_QT_HEADERS}
 Libraries = ${OE_QMAKE_PATH_LIBS}
 ArchData = ${OE_QMAKE_PATH_ARCHDATA}
 Data = ${OE_QMAKE_PATH_DATA}