diff options
Diffstat (limited to 'meta/recipes-qt/qt5/nativesdk-qtbase_git.bb')
| -rw-r--r-- | meta/recipes-qt/qt5/nativesdk-qtbase_git.bb | 138 |
1 files changed, 94 insertions, 44 deletions
diff --git a/meta/recipes-qt/qt5/nativesdk-qtbase_git.bb b/meta/recipes-qt/qt5/nativesdk-qtbase_git.bb index 87da66e44f..a840f2d81f 100644 --- a/meta/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/meta/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -3,19 +3,16 @@ DEPENDS = "nativesdk-zlib qtbase-native" SECTION = "libs" HOMEPAGE = "http://qt-project.org" -LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" +LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://LICENSE.LGPLv21;md5=fb91571854638f10b2e5f36562661a5a \ file://LICENSE.LGPLv3;md5=a909b94c1c9674b2aa15ff03a86f518a \ - file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " + QT_MODULE = "qtbase" require nativesdk-qt5.inc @@ -25,28 +22,26 @@ require qt5-git.inc FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase -# Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-shared -# 5.10.meta-qt5-shared.2 +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.6-shared +# 5.6.meta-qt5-shared.9 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ - file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ - file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ - file://0004-configure-bump-path-length-from-256-to-512-character.patch \ - file://0005-Disable-all-unknown-features-instead-of-erroring-out.patch \ - file://0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ - file://0007-Delete-qlonglong-and-qulonglong.patch \ - file://0008-Replace-pthread_yield-with-sched_yield.patch \ - file://0009-Add-OE-specific-specs-for-clang-compiler.patch \ - file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ - file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ - file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ + file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ + file://0003-Add-external-hostbindir-option.patch \ + file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ + file://0005-configure-bump-path-length-from-256-to-512-character.patch \ + file://0006-QOpenGLPaintDevice-sub-area-support.patch \ + file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \ + file://0008-configure-paths-for-target-qmake-properly.patch \ + file://0009-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ " # common for qtbase-native and nativesdk-qtbase -# Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-native -# 5.10.meta-qt5-native.2 +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.6-native +# 5.6.meta-qt5-native.9 SRC_URI += " \ - file://0013-Always-build-uic-and-qvkgen.patch \ + file://0010-Always-build-uic.patch \ + file://0011-Add-external-hostbindir-option-for-native-sdk.patch \ " # CMake's toolchain configuration of nativesdk-qtbase @@ -63,11 +58,10 @@ FILES_${PN}-tools-dev = " \ ${FILES_SOLIBSDEV} ${libdir}/*.la \ ${libdir}/*.prl \ ${OE_QMAKE_PATH_ARCHDATA}/mkspecs \ - ${OE_QMAKE_PATH_LIBS}/*.prl \ " FILES_${PN}-tools-staticdev = " \ - ${OE_QMAKE_PATH_LIBS}/*.a \ + ${libdir}/libQt5Bootstrap.a \ " FILES_${PN}-tools-dbg = " \ @@ -101,19 +95,71 @@ QT_CONFIG_FLAGS += " \ OE_QMAKE_PATH_HOST_DATA = "${libdir}${QT_DIR_NAME}" OE_QMAKE_PATH_HOST_LIBS = "${libdir}" -# for qtbase configuration we need default settings -# since we cannot set empty set filename to a not existent file -deltask generate_qt_config_file +do_generate_qt_config_file() { + cat > ${QT_CONF_PATH} <<EOF +[Paths] +Prefix = ${OE_QMAKE_PATH_PREFIX} +Headers = ${OE_QMAKE_PATH_HEADERS} +Libraries = ${OE_QMAKE_PATH_LIBS} +ArchData = ${OE_QMAKE_PATH_ARCHDATA} +Data = ${OE_QMAKE_PATH_DATA} +Binaries = ${OE_QMAKE_PATH_BINS} +LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS} +Plugins = ${OE_QMAKE_PATH_PLUGINS} +Imports = ${OE_QMAKE_PATH_IMPORTS} +Qml2Imports = ${OE_QMAKE_PATH_QML} +Translations = ${OE_QMAKE_PATH_TRANSLATIONS} +Documentation = ${OE_QMAKE_PATH_DOCS} +Settings = ${OE_QMAKE_PATH_SETTINGS} +Examples = ${OE_QMAKE_PATH_EXAMPLES} +Tests = ${OE_QMAKE_PATH_TESTS} +HostBinaries = ${OE_QMAKE_PATH_HOST_BINS} +HostData = ${OE_QMAKE_PATH_HOST_DATA} +HostLibraries = ${OE_QMAKE_PATH_HOST_LIBS} +HostSpec = ${OE_QMAKESPEC} +TartgetSpec = ${OE_XQMAKESPEC} +ExternalHostBinaries = ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} +Sysroot = +EOF +} + +do_generate_qt_config_file_append() { + cat >> ${QT_CONF_PATH} <<EOF + +[EffectivePaths] +Prefix=.. +EOF +} + +# qtbase is exception, we need to use mkspecs from ${S} +QMAKE_MKSPEC_PATH = "${B}" + +# qtbase is exception, configure script is using our get(X)QEvalMakeConf and setBootstrapEvalVariable functions to read it from shell +export OE_QMAKE_COMPILER +export OE_QMAKE_CC +export OE_QMAKE_CFLAGS +export OE_QMAKE_CXX +export OE_QMAKE_CXXFLAGS +export OE_QMAKE_LINK +export OE_QMAKE_LDFLAGS +export OE_QMAKE_AR +export OE_QMAKE_STRIP + +# another exception is that we need to run bin/qmake, because EffectivePaths are relative to qmake location +OE_QMAKE_QMAKE_ORIG = "${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/qmake" +OE_QMAKE_QMAKE = "bin/qmake" do_configure() { - # Regenerate header files when they are included in source tarball - # Otherwise cmake files don't set PRIVATE_HEADERS correctly - rm -rf ${S}/include - mkdir -p ${S}/.git || true + # we need symlink in path relative to source, because + # EffectivePaths:Prefix is relative to qmake location + if [ ! -e ${B}/bin/qmake ]; then + mkdir -p ${B}/bin + ln -sf ${OE_QMAKE_QMAKE_ORIG} ${B}/bin/qmake + fi ${S}/configure -v \ - -${QT_EDITION} -confirm-license \ - -sysroot ${STAGING_DIR_TARGET} \ + -opensource -confirm-license \ + -sysroot ${STAGING_DIR_NATIVE} \ -no-gcc-sysroot \ -system-zlib \ -dbus-runtime \ @@ -129,8 +175,6 @@ do_configure() { -no-opengl \ -no-openssl \ -no-xcb \ - -no-feature-bearermanagement \ - -no-icu \ -verbose \ -release \ -prefix ${OE_QMAKE_PATH_PREFIX} \ @@ -155,15 +199,27 @@ do_configure() { -silent \ -nomake examples \ -nomake tests \ + -nomake libs \ -no-compile-examples \ -no-rpath \ - -platform ${OE_QMAKE_PLATFORM_NATIVE} \ - -xplatform ${OE_QMAKE_PLATFORM} \ + -platform ${OE_QMAKESPEC} \ + -xplatform linux-oe-g++ \ ${QT_CONFIG_FLAGS} + + bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. PACKAGECONFIG_CONFARGS was ${PACKAGECONFIG_CONFARGS}" } do_install() { - qmake5_base_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" + + oe_runmake install INSTALL_ROOT=${D} + + install -m 755 ${B}/bin/qmake-target ${D}${OE_QMAKE_PATH_HOST_BINS}/qmake + + # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt) + # e.g. qt3d, qtwayland + ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt # remove things unused in nativesdk, we need the headers and libs rm -rf ${D}${datadir} \ @@ -174,10 +230,6 @@ do_install() { # Install CMake's toolchain configuration mkdir -p ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/ install -m 644 ${WORKDIR}/OEQt5Toolchain.cmake ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/ - - # Fix up absolute paths in scripts - grep -lr /usr/bin/python ${D}${OE_QMAKE_PATH_QT_ARCHDATA}/ | \ - xargs -r sed -i -e '1s,#!.*python,#! ${USRBINPATH}/env python,' } fakeroot do_generate_qt_environment_file() { @@ -192,7 +244,6 @@ fakeroot do_generate_qt_environment_file() { echo 'export OE_QMAKE_CXX=$CXX' >> $script echo 'export OE_QMAKE_LINK=$CXX' >> $script echo 'export OE_QMAKE_AR=$AR' >> $script - echo 'export OE_QMAKE_STRIP=$STRIP' >> $script echo 'export QT_CONF_PATH=${OE_QMAKE_PATH_HOST_BINS}/qt.conf' >> $script echo 'export OE_QMAKE_LIBDIR_QT=`qmake -query QT_INSTALL_LIBS`' >> $script echo 'export OE_QMAKE_INCDIR_QT=`qmake -query QT_INSTALL_HEADERS`' >> $script @@ -209,7 +260,6 @@ fakeroot do_generate_qt_environment_file() { sed -i -e 's:${SDKPATHNATIVE}:$OECORE_NATIVE_SYSROOT:g' $script } -do_generate_qt_environment_file[umask] = "022" addtask generate_qt_environment_file after do_install before do_package -SRCREV = "6c6ace9d23f90845fd424e474d38fe30f070775e" +SRCREV = "e6f8b072d2bf15f8b82bede48ff29ce8ac8dbd9a" |