Message ID | 20200217212350.29750-7-anaumann@ultratronik.de |
---|---|
State | Accepted |
Headers | show |
Series | Qt5 qmake infra and per-package compatibility | expand |
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
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 >
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
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 --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
Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> --- package/qwt/qwt.mk | 1 + 1 file changed, 1 insertion(+)