diff options
| author | Anders Darander <anders@chargestorm.se> | 2014-10-20 08:32:10 +0200 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2014-10-21 09:37:45 -0200 |
| commit | b62bda97802a3c79586e4e1c7b31f95e617cc0c8 (patch) | |
| tree | a4d61f21e9dc1a5e2a1fae0417e7e5b51706b797 | |
| parent | c4de929f3824375cc4cc5a6c9082f101ea22bc84 (diff) | |
nativesdk-qtbase: make it possible to keep additional libraries
In some usecases for the nativesdk, you might need some build tools that are built upon Qt5. This means
that we're having a need to keep more of the libraries build by nativsdk-qtbase. This patch adds the
infrastructure to support that
Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| -rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase.inc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc index 09f3d9af..832fda94 100644 --- a/recipes-qt/qt5/nativesdk-qtbase.inc +++ b/recipes-qt/qt5/nativesdk-qtbase.inc @@ -194,6 +194,16 @@ do_configure() { bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}" } +# Set the EXTRA_QTLIB variable to e.g. Xml, in order to not remove libQt5Xml.so.* +EXTRA_QTLIB ?= "" + +python __anonymous () { + templibs = "" + for e in d.getVar("EXTRA_QTLIB", True).split(): + templibs = "%s -not -name 'libQt5%s.so*' -and" % (templibs, e) + d.setVar("QTLIBSPRESERVE", templibs) +} + do_install() { # Fix install paths for all find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE},(INSTALL_ROOT)${STAGING_DIR_NATIVE},g" @@ -216,6 +226,7 @@ do_install() { ${D}${libdir}/pkgconfig find ${D}${libdir} -maxdepth 1 -name 'lib*' -and \ -not -name 'libQt5Core.so*' -and \ + ${QTLIBSPRESERVE} \ -not -name 'libQt5Bootstrap.a' \ -exec rm '{}' ';' } |