aboutsummaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-05-09 14:15:18 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2016-05-09 16:12:26 +0300
commit5bd17acd072dd168bf1ecadde9cd2b9641c08c6c (patch)
tree78f015a9a9060dbe4778001e3b0e50dc30900276 /classes
parente6897ccd0eec8fb5229e0fdd8f354292e0f49a16 (diff)
parent0e5756c97ace089ddd9714f0eafffd71dd15c6ab (diff)
Merge remote-tracking branch 'meta-qt5/master' into 5.7
* meta-qt5/master: qtwebkit: add PACKAGECONFIGs for libxcomposite, libxrender, fontconfig qtbase: remove fonts packages qtbase: Remove unsupported options xvideo, xinerama, xinput, gtkstyle qt5: upgrade to latest revisions in 5.7 branches qt5: add one more subfolder for ${PN}-qmldesigner replace base_contains by bb.utils.contains qt5: upgrade to latest revision in 5.6 branch qt5: set SRCREVs,PVs to 5.6.0 qtquickcontrols: fix compilation of examples/texteditor qtdeclarative: fix compilation of examples/qquickviewcomparison quazip: update to 0.7.2 qtquickcontrols2: initial add 5.6.0 qmake5_base: use remove-libtool bbclass recipes: use new PACKAGECONFIG_CONFARGS instead of EXTRA_OECONF qtwebengine: enable ARMv7VE support Add .gitignore to ignore .pyc/.pyo files Conflicts: classes/qmake5_base.bbclass recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qt3d_git.bb recipes-qt/qt5/qt5-git.inc recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch 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/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch recipes-qt/qt5/qtbase/0009-Always-build-uic.patch recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtcanvas3d_git.bb recipes-qt/qt5/qtconnectivity_git.bb recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch recipes-qt/qt5/qtdeclarative_git.bb recipes-qt/qt5/qtgraphicaleffects_git.bb recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch recipes-qt/qt5/qtimageformats_git.bb recipes-qt/qt5/qtlocation_git.bb recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtquickcontrols_git.bb recipes-qt/qt5/qtscript_git.bb recipes-qt/qt5/qtsensors_git.bb recipes-qt/qt5/qtserialport_git.bb recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch recipes-qt/qt5/qtsvg_git.bb recipes-qt/qt5/qtsystems_git.bb recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch recipes-qt/qt5/qttools_git.bb recipes-qt/qt5/qtwayland-native_git.bb recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch recipes-qt/qt5/qtwayland_git.bb recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch recipes-qt/qt5/qtwebkit_git.bb recipes-qt/qt5/qtwebsockets_git.bb recipes-qt/qt5/qtxmlpatterns_git.bb Change-Id: Ifab26e8f8a0c8cb8af94509f657161de09c182d7
Diffstat (limited to 'classes')
-rw-r--r--classes/qmake5_base.bbclass2
1 files changed, 0 insertions, 2 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index eb070a0a..d50203ed 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -171,7 +171,6 @@ qmake5_base_do_configure () {
qmake5_base_native_do_install() {
oe_runmake install INSTALL_ROOT=${D}
- find "${D}" -ignore_readdir_race -name "*.la" -delete
}
qmake5_base_fix_install() {
@@ -196,7 +195,6 @@ qmake5_base_do_install() {
find . -name "Makefile*" | xargs -r sed -i "s,(INSTALL_ROOT)${STAGING_DIR_NATIVE},(INSTALL_ROOT),g"
oe_runmake install INSTALL_ROOT=${D}
- find "${D}" -ignore_readdir_race -name "*.la" -delete
# everything except HostData and HostBinaries is prefixed with sysroot value,
# but we cannot remove sysroot override, because that's useful for pkg-config etc