diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-08-23 13:28:36 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-08-23 16:37:11 +0300 |
| commit | 7a2707393eccad021763cd9a4294e471883b8590 (patch) | |
| tree | 713154f6563edc827a610793baa5a33c6b088a53 /classes | |
| parent | 0fc7aeb1cbe2c63e24ce6ef06d290ac586133c2e (diff) | |
| parent | d9cd5ede502ddf04767d5531340b12050ee7f899 (diff) | |
Merge remote-tracking branch 'meta-qt5/master' into 5.7
* meta-qt5/master:
qtbase: fix drm dependency for eglfs PACKAGECONFIG
qt5: upgrade to latest revisions in 5.7 branch
qt5-opengles2-test: remove
cmake_qt5.bbclass: when using _prepend don't forget to add space at the end
qtquick1: fix qtwebkit support
qtbase: add PACKAGECONFIG for journald logging
qtserialbus: add recipe
qtwayland: Rework recipe to allow PACKAGECONFIG use
qtwayland: add dependency on libxcomposite
qtcharts: Add dependency on qtmultimedia
packagegroup-qt5-toolchain-target.bb: Add qtdeclarative-tools to RDEPENDS.
Conflicts:
classes/qmake5_base.bbclass
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qt3d_git.bb
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtconnectivity_git.bb
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtimageformats_git.bb
recipes-qt/qt5/qtlocation_git.bb
recipes-qt/qt5/qtmultimedia_git.bb
recipes-qt/qt5/qtquick1_git.bb
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtsensors_git.bb
recipes-qt/qt5/qtserialport_git.bb
recipes-qt/qt5/qtsystems_git.bb
recipes-qt/qt5/qttools_git.bb
recipes-qt/qt5/qttranslations_git.bb
recipes-qt/qt5/qtwayland-native_git.bb
recipes-qt/qt5/qtwayland_git.bb
recipes-qt/qt5/qtwebengine_git.bb
recipes-qt/qt5/qtxmlpatterns_git.bb
Change-Id: Ia3d047984b6249526d6bf14373114d0fc734c458
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/cmake_qt5.bbclass | 3 | ||||
| -rw-r--r-- | classes/qmake5_base.bbclass | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/classes/cmake_qt5.bbclass b/classes/cmake_qt5.bbclass index 4dc897bb..3180fd6d 100644 --- a/classes/cmake_qt5.bbclass +++ b/classes/cmake_qt5.bbclass @@ -32,4 +32,5 @@ EXTRA_OECMAKE_prepend = " \ -DOE_QMAKE_PATH_QT_DOCS=${OE_QMAKE_PATH_QT_DOCS} \ -DOE_QMAKE_PATH_QT_SETTINGS=${OE_QMAKE_PATH_QT_SETTINGS} \ -DOE_QMAKE_PATH_QT_EXAMPLES=${OE_QMAKE_PATH_QT_EXAMPLES} \ - -DOE_QMAKE_PATH_QT_TESTS=${OE_QMAKE_PATH_QT_TESTS}" + -DOE_QMAKE_PATH_QT_TESTS=${OE_QMAKE_PATH_QT_TESTS} \ +" diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index d50203ed..f273567d 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -171,6 +171,10 @@ qmake5_base_do_configure () { qmake5_base_native_do_install() { oe_runmake install INSTALL_ROOT=${D} + find "${D}" -ignore_readdir_race -name "*.la" -delete + if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>/dev/null; then + sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/Qt5*.pc + fi } qmake5_base_fix_install() { @@ -203,4 +207,8 @@ qmake5_base_do_install() { qmake5_base_fix_install ${STAGING_DIR_TARGET} qmake5_base_fix_install ${STAGING_DIR_HOST} qmake5_base_fix_install ${STAGING_DIR_NATIVE} + + if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>/dev/null; then + sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/Qt5*.pc + fi } |