gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

qtuio: correct install-target/staging when Qt library type is 'static' 

If BR2_PACKAGE_QT_STATIC is set, qtuio will not build a .so file, but .a.
However, the custom INSTALL_TARGET_CMDS and INSTALL_STAGING_CMDS
unconditionally attempted to copy the .so file.

This commit checks the requested Qt library type and copies the right
library for each case, taking into account that the static .a file does not
need to be copied to the target directory.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Thomas De Schampheleire 2014-02-17 10:51:03 +01:00 committed by Peter Korsgaard
parent 8e63d54e2a
commit 31d212b3e1
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
package/qtuio/qtuio.mk
View File

@ -51,13 +51,22 @@ define QTUIO_INSTALL_EXAMPLES
endef
endif
ifeq ($(BR2_PACKAGE_QT_STATIC),y)
QTUIO_LIBRARY = libqTUIO.a
else
QTUIO_LIBRARY = libqTUIO.so*
define QTUIO_INSTALL_TARGET_LIBRARY
cp -dpf $(@D)/lib/$(QTUIO_LIBRARY) $(TARGET_DIR)/usr/lib
endef
endif
define QTUIO_INSTALL_TARGET_CMDS
cp -dpf $(@D)/lib/libqTUIO.so* $(TARGET_DIR)/usr/lib
$(QTUIO_INSTALL_TARGET_LIBRARY)
$(QTUIO_INSTALL_EXAMPLES)
endef
define QTUIO_INSTALL_STAGING_CMDS
cp -dpf $(@D)/lib/libqTUIO.so* $(STAGING_DIR)/usr/lib
cp -dpf $(@D)/lib/$(QTUIO_LIBRARY) $(STAGING_DIR)/usr/lib
endef
$(eval $(generic-package))