diff mbox series

[v6,06/28] package/qwt: Add missing qt5svg dependency

Message ID 20200217212350.29750-7-anaumann@ultratronik.de
State Accepted
Headers show
Series Qt5 qmake infra and per-package compatibility | expand

Commit Message

Andreas Naumann Feb. 17, 2020, 9:23 p.m. UTC 
Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
---
 package/qwt/qwt.mk | 1 +
 1 file changed, 1 insertion(+)

Comments

Thomas Petazzoni Feb. 17, 2020, 9:56 p.m. UTC | #1 
On Mon, 17 Feb 2020 22:23:28 +0100
Andreas Naumann <anaumann@ultratronik.de> wrote:

> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
> ---
>  package/qwt/qwt.mk | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk
> index 1fec17b19a..50df7e2642 100644
> --- a/package/qwt/qwt.mk
> +++ b/package/qwt/qwt.mk
> @@ -19,6 +19,7 @@ QWT_CONFIG += -e 's%/features%/mkspecs/features%'
>  
>  ifeq ($(BR2_PACKAGE_QWT_SVG),y)
>  QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/QWT_CONFIG += QwtSvg/'
> +QWT_DEPENDENCIES += qt5svg
>  else
>  QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/\# QWT_CONFIG += QwtSvg/'
>  endif

This looks like a fix we should apply today. Why doesn't this trigger
any autobuilder failure?

Thomas
Andreas Naumann Feb. 18, 2020, 9:43 a.m. UTC | #2 
Hi

Am 17.02.20 um 22:56 schrieb Thomas Petazzoni:
> On Mon, 17 Feb 2020 22:23:28 +0100
> Andreas Naumann <anaumann@ultratronik.de> wrote:
> 
>> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
>> ---
>>   package/qwt/qwt.mk | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk
>> index 1fec17b19a..50df7e2642 100644
>> --- a/package/qwt/qwt.mk
>> +++ b/package/qwt/qwt.mk
>> @@ -19,6 +19,7 @@ QWT_CONFIG += -e 's%/features%/mkspecs/features%'
>>   
>>   ifeq ($(BR2_PACKAGE_QWT_SVG),y)
>>   QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/QWT_CONFIG += QwtSvg/'
>> +QWT_DEPENDENCIES += qt5svg
>>   else
>>   QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/\# QWT_CONFIG += QwtSvg/'
>>   endif
> 
> This looks like a fix we should apply today. Why doesn't this trigger
> any autobuilder failure?

Probably because qwt is built after qt5svg (more or less by chance). 
However, in per-package mode this becomes a problem because the libs are 
not copied to the qwt per-package staging.

regards,
Andreas

> 
> Thomas
>
Thomas Petazzoni Feb. 18, 2020, 2:58 p.m. UTC | #3 
On Tue, 18 Feb 2020 10:43:17 +0100
Andreas Naumann <dev@andin.de> wrote:

> > This looks like a fix we should apply today. Why doesn't this trigger
> > any autobuilder failure?  
> 
> Probably because qwt is built after qt5svg (more or less by chance). 
> However, in per-package mode this becomes a problem because the libs are 
> not copied to the qwt per-package staging.

Ah yes, indeed. It's still a good bug fix that we can apply to master
now, independently of the rest of the series.

Thanks!

Thomas
Thomas Petazzoni Feb. 19, 2020, 7:16 p.m. UTC | #4 
On Mon, 17 Feb 2020 22:23:28 +0100
Andreas Naumann <anaumann@ultratronik.de> wrote:

> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
> ---
>  package/qwt/qwt.mk | 1 +
>  1 file changed, 1 insertion(+)

Applied to master, thanks.

Thomas
diff mbox series

Patch

diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk
index 1fec17b19a..50df7e2642 100644
--- a/package/qwt/qwt.mk
+++ b/package/qwt/qwt.mk
@@ -19,6 +19,7 @@  QWT_CONFIG += -e 's%/features%/mkspecs/features%'
 
 ifeq ($(BR2_PACKAGE_QWT_SVG),y)
 QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/QWT_CONFIG += QwtSvg/'
+QWT_DEPENDENCIES += qt5svg
 else
 QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/\# QWT_CONFIG += QwtSvg/'
 endif