qt5webkit: install qml's only if declarative module is selected
PATCH 1/1 qt5webkit: install qml's only if declarative module is selected
Fixes http://autobuild.buildroot.net/results/a9bbba68f22076ea2c86ee09ebe8a0a5e86b3b54/
Signed-off-by Fatih A??c? <[email protected]>
--- package/qt5/qt5webkit/qt5webkit.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
package/qt5/qt5webkit/qt5webkit.mk +11 -1
@@ -25,6 +25,10 @@ ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) QT5WEBKIT_DEPENDENCIES += xlib_libXrender endif +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) +QT5WEBKIT_DEPENDENCIES += qt5declarative +endif + define QT5WEBKIT_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) endef
@@ -38,10 +42,16 @@ define QT5WEBKIT_INSTALL_STAGING_CMDS $(QT5_LA_PRL_FILES_FIXUP) endef +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) +define QT5WEBKIT_INSTALL_TARGET_QMLS + cp -dpfr $(STAGING_DIR)/usr/qml/QtWebKit $(TARGET_DIR)/usr/qml/ +endef +endif + define QT5WEBKIT_INSTALL_TARGET_CMDS cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebKit*.so.* $(TARGET_DIR)/usr/lib cp -dpf $(@D)/bin/* $(TARGET_DIR)/usr/bin/ - cp -dpfr $(STAGING_DIR)/usr/qml/QtWebKit $(TARGET_DIR)/usr/qml/ + $(QT5WEBKIT_INSTALL_TARGET_QMLS) endef $(eval $(generic-package))
Signature · 1 line
1.7.10.4
PATCH 1/1 qt5webkit: install qml's only if declarative module is selected
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fatih" == Fatih A??c? <[email protected]> writes:
Fatih> Fixes http://autobuild.buildroot.net/results/a9bbba68f22076ea2c86ee09ebe8a0a5e86b3b54/
Fatih> Signed-off-by: Fatih A??c? <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard