[1/1] package/qt5/qt5charts: fix install with per-package
diff mbox series

Message ID 20200216194230.1413696-1-fontaine.fabrice@gmail.com
State Not Applicable
Headers show
Series
  • [1/1] package/qt5/qt5charts: fix install with per-package
Related show

Commit Message

Fabrice Fontaine Feb. 16, 2020, 7:42 p.m. UTC
With per-package configuration, qt5charts fails to install libraries:
cp -dpf /home/buildroot/autobuild/instance-1/output-1/per-package/qt5charts/host/arc-buildroot-linux-gnu/sysroot/usr/lib/libQt5Charts*.so.* /home/buildroot/autobuild/instance-1/output-1/per-package/qt5charts/target/usr/lib
cp: cannot stat '/home/buildroot/autobuild/instance-1/output-1/per-package/qt5charts/host/arc-buildroot-linux-gnu/sysroot/usr/lib/libQt5Charts*.so.*': No such file or directory

Fixes:
 - http://autobuild.buildroot.org/results/4bc62fbe67bec9b5d8c6d4bb28a4987ac67308bb

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/qt5/qt5charts/qt5charts.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Peter Seiderer Feb. 16, 2020, 8:23 p.m. UTC | #1
Hello Fabrice,

On Sun, 16 Feb 2020 20:42:30 +0100, Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> With per-package configuration, qt5charts fails to install libraries:
> cp -dpf /home/buildroot/autobuild/instance-1/output-1/per-package/qt5charts/host/arc-buildroot-linux-gnu/sysroot/usr/lib/libQt5Charts*.so.* /home/buildroot/autobuild/instance-1/output-1/per-package/qt5charts/target/usr/lib
> cp: cannot stat '/home/buildroot/autobuild/instance-1/output-1/per-package/qt5charts/host/arc-buildroot-linux-gnu/sysroot/usr/lib/libQt5Charts*.so.*': No such file or directory
>
> Fixes:
>  - http://autobuild.buildroot.org/results/4bc62fbe67bec9b5d8c6d4bb28a4987ac67308bb
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/qt5/qt5charts/qt5charts.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk
> index e359747503..14c54e81bf 100644
> --- a/package/qt5/qt5charts/qt5charts.mk
> +++ b/package/qt5/qt5charts/qt5charts.mk
> @@ -38,7 +38,7 @@ endef
>
>  ifeq ($(BR2_STATIC_LIBS),)
>  define QT5CHARTS_INSTALL_TARGET_LIBS
> -	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Charts*.so.* $(TARGET_DIR)/usr/lib
> +	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Charts.so.* $(TARGET_DIR)/usr/lib

No doubt in the case of qt5charts the first '*' is redundant, but are you sure this
fixes it for the per-package case?

The autobuild log states:

  install -m 755 -p ../../lib/libQt5Charts.so.2.1.3 /home/buildroot/autobuild/instance-1/output-1/per-package/qt5base/host/arc-buildroot-linux-gnu/sysroot/usr/lib/libQt5Charts.so.2.1.3

The original 'libQt5Charts.so.2.1.3' file is installed into the qt5base per-package directory instead
of the qt5charts per-package directory one...

Regards,
Peter


>  	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/* $(TARGET_DIR)/usr/lib/qt/plugins
>  endef
>  endif
Fabrice Fontaine Feb. 16, 2020, 9:03 p.m. UTC | #2
Hello Peter,

Le dim. 16 févr. 2020 à 21:24, Peter Seiderer <ps.report@gmx.net> a écrit :
>
> Hello Fabrice,
>
> On Sun, 16 Feb 2020 20:42:30 +0100, Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
>
> > With per-package configuration, qt5charts fails to install libraries:
> > cp -dpf /home/buildroot/autobuild/instance-1/output-1/per-package/qt5charts/host/arc-buildroot-linux-gnu/sysroot/usr/lib/libQt5Charts*.so.* /home/buildroot/autobuild/instance-1/output-1/per-package/qt5charts/target/usr/lib
> > cp: cannot stat '/home/buildroot/autobuild/instance-1/output-1/per-package/qt5charts/host/arc-buildroot-linux-gnu/sysroot/usr/lib/libQt5Charts*.so.*': No such file or directory
> >
> > Fixes:
> >  - http://autobuild.buildroot.org/results/4bc62fbe67bec9b5d8c6d4bb28a4987ac67308bb
> >
> > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> > ---
> >  package/qt5/qt5charts/qt5charts.mk | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk
> > index e359747503..14c54e81bf 100644
> > --- a/package/qt5/qt5charts/qt5charts.mk
> > +++ b/package/qt5/qt5charts/qt5charts.mk
> > @@ -38,7 +38,7 @@ endef
> >
> >  ifeq ($(BR2_STATIC_LIBS),)
> >  define QT5CHARTS_INSTALL_TARGET_LIBS
> > -     cp -dpf $(STAGING_DIR)/usr/lib/libQt5Charts*.so.* $(TARGET_DIR)/usr/lib
> > +     cp -dpf $(STAGING_DIR)/usr/lib/libQt5Charts.so.* $(TARGET_DIR)/usr/lib
>
> No doubt in the case of qt5charts the first '*' is redundant, but are you sure this
> fixes it for the per-package case?
>
> The autobuild log states:
>
>   install -m 755 -p ../../lib/libQt5Charts.so.2.1.3 /home/buildroot/autobuild/instance-1/output-1/per-package/qt5base/host/arc-buildroot-linux-gnu/sysroot/usr/lib/libQt5Charts.so.2.1.3
>
> The original 'libQt5Charts.so.2.1.3' file is installed into the qt5base per-package directory instead
> of the qt5charts per-package directory one...
Indeed, you're right, I thought my patch was fixing the issue but it
was not. The issue was fixed by running make qt5charts-dirclean and
make qt5charts a second time ...
It should be noted that the same kind of build failure are raised on
qt5svg, qt5webengine, qt5xmlpatterns and qt5scripts.
There is patch in patchwork from March 2019 that could fix this issue
but it is set as superseded:
https://patchwork.ozlabs.org/patch/1056425/.
>
> Regards,
> Peter
>
>
> >       cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/* $(TARGET_DIR)/usr/lib/qt/plugins
> >  endef
> >  endif
>
Best Regards,

Fabrice
Thomas Petazzoni Feb. 17, 2020, 12:13 a.m. UTC | #3
Hello,

On Sun, 16 Feb 2020 22:03:48 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> > The original 'libQt5Charts.so.2.1.3' file is installed into the qt5base per-package directory instead
> > of the qt5charts per-package directory one...  
> Indeed, you're right, I thought my patch was fixing the issue but it
> was not. The issue was fixed by running make qt5charts-dirclean and
> make qt5charts a second time ...
> It should be noted that the same kind of build failure are raised on
> qt5svg, qt5webengine, qt5xmlpatterns and qt5scripts.
> There is patch in patchwork from March 2019 that could fix this issue
> but it is set as superseded:
> https://patchwork.ozlabs.org/patch/1056425/.

Andreas Naumann (in Cc) is working on making Qt5 compatible with
per-package directory builds.

Best regards,

Thomas
Andreas Naumann Feb. 17, 2020, 7:19 p.m. UTC | #4
Hi Thomas, all,

Am 17.02.20 um 01:13 schrieb Thomas Petazzoni:
> Hello,
> 
> On Sun, 16 Feb 2020 22:03:48 +0100
> Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> 
>>> The original 'libQt5Charts.so.2.1.3' file is installed into the qt5base per-package directory instead
>>> of the qt5charts per-package directory one...
>> Indeed, you're right, I thought my patch was fixing the issue but it
>> was not. The issue was fixed by running make qt5charts-dirclean and
>> make qt5charts a second time ...
>> It should be noted that the same kind of build failure are raised on
>> qt5svg, qt5webengine, qt5xmlpatterns and qt5scripts.
>> There is patch in patchwork from March 2019 that could fix this issue
>> but it is set as superseded:
>> https://patchwork.ozlabs.org/patch/1056425/.
> 
> Andreas Naumann (in Cc) is working on making Qt5 compatible with
> per-package directory builds.

Yes, actually I'm still not quite happy with what I have, or better, 
with the amount of testing that I got done, but I guess I'll just send 
what I have now and see your comments.

Anyway, my approach to fix above issue is to use per-package customized 
versions of qt.conf with the per-package sysroot and derive target 
install from these folders also.


best regards,
Andreas

> 
> Best regards,
> 
> Thomas
>
Thomas Petazzoni Feb. 17, 2020, 7:25 p.m. UTC | #5
On Mon, 17 Feb 2020 20:19:15 +0100
Andreas Naumann <dev@andin.de> wrote:

> Yes, actually I'm still not quite happy with what I have, or better, 
> with the amount of testing that I got done, but I guess I'll just send 
> what I have now and see your comments.

I think you should go ahead and send it. Other people can help with the
testing, and perhaps by reviewing suggest other ideas.

> Anyway, my approach to fix above issue is to use per-package customized 
> versions of qt.conf with the per-package sysroot and derive target 
> install from these folders also.

OK.

Thomas

Patch
diff mbox series

diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk
index e359747503..14c54e81bf 100644
--- a/package/qt5/qt5charts/qt5charts.mk
+++ b/package/qt5/qt5charts/qt5charts.mk
@@ -38,7 +38,7 @@  endef
 
 ifeq ($(BR2_STATIC_LIBS),)
 define QT5CHARTS_INSTALL_TARGET_LIBS
-	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Charts*.so.* $(TARGET_DIR)/usr/lib
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Charts.so.* $(TARGET_DIR)/usr/lib
 	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/* $(TARGET_DIR)/usr/lib/qt/plugins
 endef
 endif