qt53d: fix install issue with qt5.6

Message ID 20180611135655.22300-1-gael.portay@savoirfairelinux.com
State Accepted
Headers show
Series
  • qt53d: fix install issue with qt5.6
Related show

Commit Message

Gaël PORTAY June 11, 2018, 1:56 p.m.
Both plugins `geometryloaders' and `renderplugins' are available since
Qt 5.9.

Fixes:

	>>> qt53d 5.6.3 Installing to target
	cp -dpf /home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/libQt53D*.so.*
/home/gportay/src/buildroot/output/target/usr/lib
	cp -dpfr /home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/plugins/geometryloaders
/home/gportay/src/buildroot/output/target/usr/lib/qt/plugins
	cp: cannot stat '/home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/plugins/geometryloaders': No such file or directory
	package/pkg-generic.mk:310: recipe for target '/home/gportay/src/buildroot/output/build/qt53d-5.6.3/.stamp_target_installed' failed
	make[2]: *** [/home/gportay/src/buildroot/output/build/qt53d-5.6.3/.stamp_target_installed] Error 1

Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
---
 package/qt5/qt53d/qt53d.mk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Comments

Romain REIGNIER June 11, 2018, 2:33 p.m. | #1
This patch make sense. Sorry for the regression with my last contribution.

Le lun. 11 juin 2018 à 21:56, Gaël PORTAY <gael.portay@savoirfairelinux.com>
a écrit :

> Both plugins `geometryloaders' and `renderplugins' are available since
> Qt 5.9.
>
> Fixes:
>
>         >>> qt53d 5.6.3 Installing to target
>         cp -dpf
> /home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/libQt53D*.so.*
> /home/gportay/src/buildroot/output/target/usr/lib
>         cp -dpfr
> /home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/plugins/geometryloaders
> /home/gportay/src/buildroot/output/target/usr/lib/qt/plugins
>         cp: cannot stat
> '/home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/plugins/geometryloaders':
> No such file or directory
>         package/pkg-generic.mk:310: recipe for target
> '/home/gportay/src/buildroot/output/build/qt53d-5.6.3/.stamp_target_installed'
> failed
>         make[2]: ***
> [/home/gportay/src/buildroot/output/build/qt53d-5.6.3/.stamp_target_installed]
> Error 1
>
> Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
> ---
>  package/qt5/qt53d/qt53d.mk | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk
> index 6896b00318..48a931d60b 100644
> --- a/package/qt5/qt53d/qt53d.mk
> +++ b/package/qt5/qt53d/qt53d.mk
> @@ -37,13 +37,19 @@ endef
>  endif
>
>  ifeq ($(BR2_STATIC_LIBS),)
> -define QT53D_INSTALL_TARGET_CMDS
> -       cp -dpf $(STAGING_DIR)/usr/lib/libQt53D*.so.* $(TARGET_DIR)/usr/lib
> +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
> +# Available since 5.9
> +define QT53D_INSTALL_TARGET_LATEST
>         cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/geometryloaders
> $(TARGET_DIR)/usr/lib/qt/plugins
>         cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/renderplugins
> $(TARGET_DIR)/usr/lib/qt/plugins
> +endef
> +endif
> +define QT53D_INSTALL_TARGET_CMDS
> +       cp -dpf $(STAGING_DIR)/usr/lib/libQt53D*.so.* $(TARGET_DIR)/usr/lib
>         cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/sceneparsers
> $(TARGET_DIR)/usr/lib/qt/plugins
>         cp -dpfr $(STAGING_DIR)/usr/qml/Qt3D $(TARGET_DIR)/usr/qml
>         cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick $(TARGET_DIR)/usr/qml
> +       $(QT53D_INSTALL_TARGET_LATEST)
>         $(QT53D_INSTALL_TARGET_EXAMPLES)
>  endef
>  endif
> --
> 2.11.0
>
>
<div dir="auto">This patch make sense. Sorry for the regression with my last contribution.</div><br><div class="gmail_quote"><div dir="ltr">Le lun. 11 juin 2018 à 21:56, Gaël PORTAY &lt;<a href="mailto:gael.portay@savoirfairelinux.com">gael.portay@savoirfairelinux.com</a>&gt; a écrit :<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Both plugins `geometryloaders&#39; and `renderplugins&#39; are available since<br>
Qt 5.9.<br>
<br>
Fixes:<br>
<br>
        &gt;&gt;&gt; qt53d 5.6.3 Installing to target<br>
        cp -dpf /home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/libQt53D*.so.*<br>
/home/gportay/src/buildroot/output/target/usr/lib<br>
        cp -dpfr /home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/plugins/geometryloaders<br>
/home/gportay/src/buildroot/output/target/usr/lib/qt/plugins<br>
        cp: cannot stat &#39;/home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/plugins/geometryloaders&#39;: No such file or directory<br>
        package/<a href="http://pkg-generic.mk:310" rel="noreferrer noreferrer" target="_blank">pkg-generic.mk:310</a>: recipe for target &#39;/home/gportay/src/buildroot/output/build/qt53d-5.6.3/.stamp_target_installed&#39; failed<br>
        make[2]: *** [/home/gportay/src/buildroot/output/build/qt53d-5.6.3/.stamp_target_installed] Error 1<br>
<br>
Signed-off-by: Gaël PORTAY &lt;<a href="mailto:gael.portay@savoirfairelinux.com" target="_blank" rel="noreferrer">gael.portay@savoirfairelinux.com</a>&gt;<br>
---<br>
 package/qt5/qt53d/<a href="http://qt53d.mk" rel="noreferrer noreferrer" target="_blank">qt53d.mk</a> | 10 ++++++++--<br>
 1 file changed, 8 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/package/qt5/qt53d/<a href="http://qt53d.mk" rel="noreferrer noreferrer" target="_blank">qt53d.mk</a> b/package/qt5/qt53d/<a href="http://qt53d.mk" rel="noreferrer noreferrer" target="_blank">qt53d.mk</a><br>
index 6896b00318..48a931d60b 100644<br>
--- a/package/qt5/qt53d/<a href="http://qt53d.mk" rel="noreferrer noreferrer" target="_blank">qt53d.mk</a><br>
+++ b/package/qt5/qt53d/<a href="http://qt53d.mk" rel="noreferrer noreferrer" target="_blank">qt53d.mk</a><br>
@@ -37,13 +37,19 @@ endef<br>
 endif<br>
<br>
 ifeq ($(BR2_STATIC_LIBS),)<br>
-define QT53D_INSTALL_TARGET_CMDS<br>
-       cp -dpf $(STAGING_DIR)/usr/lib/libQt53D*.so.* $(TARGET_DIR)/usr/lib<br>
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)<br>
+# Available since 5.9<br>
+define QT53D_INSTALL_TARGET_LATEST<br>
        cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/geometryloaders $(TARGET_DIR)/usr/lib/qt/plugins<br>
        cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/renderplugins $(TARGET_DIR)/usr/lib/qt/plugins<br>
+endef<br>
+endif<br>
+define QT53D_INSTALL_TARGET_CMDS<br>
+       cp -dpf $(STAGING_DIR)/usr/lib/libQt53D*.so.* $(TARGET_DIR)/usr/lib<br>
        cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/sceneparsers $(TARGET_DIR)/usr/lib/qt/plugins<br>
        cp -dpfr $(STAGING_DIR)/usr/qml/Qt3D $(TARGET_DIR)/usr/qml<br>
        cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick $(TARGET_DIR)/usr/qml<br>
+       $(QT53D_INSTALL_TARGET_LATEST)<br>
        $(QT53D_INSTALL_TARGET_EXAMPLES)<br>
 endef<br>
 endif<br>
-- <br>
2.11.0<br>
<br>
</blockquote></div>
Gaël PORTAY June 11, 2018, 2:44 p.m. | #2
Romain,

On Mon, Jun 11, 2018 at 10:33:44PM +0800, Romain REIGNIER wrote:
> This patch make sense. Sorry for the regression with my last contribution.
>

No worries about the regression ;)

I added you in cc to let you know that I am fixing an issue with 5.6.  I
hope it will no break what you have fixed. You probably know more things
about qt3d than me :).

Regards,
Gael
Thomas Petazzoni June 17, 2018, 12:58 p.m. | #3
Hello,

On Mon, 11 Jun 2018 09:56:55 -0400, Gaël PORTAY wrote:
> Both plugins `geometryloaders' and `renderplugins' are available since
> Qt 5.9.
> 
> Fixes:
> 
> 	>>> qt53d 5.6.3 Installing to target  
> 	cp -dpf /home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/libQt53D*.so.*
> /home/gportay/src/buildroot/output/target/usr/lib
> 	cp -dpfr /home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/plugins/geometryloaders
> /home/gportay/src/buildroot/output/target/usr/lib/qt/plugins
> 	cp: cannot stat '/home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/plugins/geometryloaders': No such file or directory
> 	package/pkg-generic.mk:310: recipe for target '/home/gportay/src/buildroot/output/build/qt53d-5.6.3/.stamp_target_installed' failed
> 	make[2]: *** [/home/gportay/src/buildroot/output/build/qt53d-5.6.3/.stamp_target_installed] Error 1
> 
> Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
> ---
>  package/qt5/qt53d/qt53d.mk | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas
Peter Korsgaard July 18, 2018, 9:11 p.m. | #4
>>>>> "Gaël" == Gaël PORTAY <gael.portay@savoirfairelinux.com> writes:

 > Both plugins `geometryloaders' and `renderplugins' are available since
 > Qt 5.9.

 > Fixes:

 >>>> qt53d 5.6.3 Installing to target
 > 	cp -dpf /home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/libQt53D*.so.*
 > /home/gportay/src/buildroot/output/target/usr/lib
 > 	cp -dpfr /home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/plugins/geometryloaders
 > /home/gportay/src/buildroot/output/target/usr/lib/qt/plugins
 > 	cp: cannot stat '/home/gportay/src/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/qt/plugins/geometryloaders': No such file or directory
 > 	package/pkg-generic.mk:310: recipe for target '/home/gportay/src/buildroot/output/build/qt53d-5.6.3/.stamp_target_installed' failed
 > 	make[2]: *** [/home/gportay/src/buildroot/output/build/qt53d-5.6.3/.stamp_target_installed] Error 1

 > Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>

Committed to 2018.02.x and 2018.05.x, thanks.

Patch

diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk
index 6896b00318..48a931d60b 100644
--- a/package/qt5/qt53d/qt53d.mk
+++ b/package/qt5/qt53d/qt53d.mk
@@ -37,13 +37,19 @@  endef
 endif
 
 ifeq ($(BR2_STATIC_LIBS),)
-define QT53D_INSTALL_TARGET_CMDS
-	cp -dpf $(STAGING_DIR)/usr/lib/libQt53D*.so.* $(TARGET_DIR)/usr/lib
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
+# Available since 5.9
+define QT53D_INSTALL_TARGET_LATEST
 	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/geometryloaders $(TARGET_DIR)/usr/lib/qt/plugins
 	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/renderplugins $(TARGET_DIR)/usr/lib/qt/plugins
+endef
+endif
+define QT53D_INSTALL_TARGET_CMDS
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt53D*.so.* $(TARGET_DIR)/usr/lib
 	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/sceneparsers $(TARGET_DIR)/usr/lib/qt/plugins
 	cp -dpfr $(STAGING_DIR)/usr/qml/Qt3D $(TARGET_DIR)/usr/qml
 	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick $(TARGET_DIR)/usr/qml
+	$(QT53D_INSTALL_TARGET_LATEST)
 	$(QT53D_INSTALL_TARGET_EXAMPLES)
 endef
 endif