From 7b898fdc664ca04d50becddb7f57570436bd717e Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 25 Nov 2013 20:47:57 -0500 Subject: [PATCH] nativesdk-qtbase: add nativesdk version of qtbase necessary for SDK tools Signed-off-by: Denys Dmytriyenko Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qt5.inc | 12 ++ recipes-qt/qt5/nativesdk-qtbase.inc | 193 ++++++++++++++++++ recipes-qt/qt5/nativesdk-qtbase_5.1.1.bb | 5 + ...ath-length-from-256-to-512-character.patch | 29 +++ ...ve-built-qmake-and-swap-with-native-.patch | 29 +++ 5 files changed, 268 insertions(+) create mode 100644 recipes-qt/qt5/nativesdk-qt5.inc create mode 100644 recipes-qt/qt5/nativesdk-qtbase.inc create mode 100644 recipes-qt/qt5/nativesdk-qtbase_5.1.1.bb create mode 100644 recipes-qt/qt5/qtbase-5.1.1/0001-configure-bump-path-length-from-256-to-512-character.patch create mode 100644 recipes-qt/qt5/qtbase-5.1.1/0001-configure-preserve-built-qmake-and-swap-with-native-.patch diff --git a/recipes-qt/qt5/nativesdk-qt5.inc b/recipes-qt/qt5/nativesdk-qt5.inc new file mode 100644 index 0000000000..2eb8c1423e --- /dev/null +++ b/recipes-qt/qt5/nativesdk-qt5.inc @@ -0,0 +1,12 @@ +inherit nativesdk qmake5_base + +# we don't want conflicts with qt4 +OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}" +OE_QMAKE_PATH_ARCHDATA = "${OE_QMAKE_PATH_QT_ARCHDATA}" +OE_QMAKE_PATH_DATA = "${OE_QMAKE_PATH_QT_DATA}" +OE_QMAKE_PATH_BINS = "${OE_QMAKE_PATH_QT_BINS}" +OE_QMAKE_PATH_TRANSLATIONS = "${OE_QMAKE_PATH_QT_TRANSLATIONS}" +OE_QMAKE_PATH_DOCS = "${OE_QMAKE_PATH_QT_DOCS}" +OE_QMAKE_PATH_SETTINGS = "${OE_QMAKE_PATH_QT_SETTINGS}" +OE_QMAKE_PATH_EXAMPLES = "${OE_QMAKE_PATH_QT_EXAMPLES}" +OE_QMAKE_PATH_TESTS = "${OE_QMAKE_PATH_QT_TESTS}" diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc new file mode 100644 index 0000000000..8e9a8097d9 --- /dev/null +++ b/recipes-qt/qt5/nativesdk-qtbase.inc @@ -0,0 +1,193 @@ +DESCRIPTION = "SDK version of Qt/[X11|Mac|Embedded]" +DEPENDS = "nativesdk-zlib nativesdk-dbus qtbase-native" +SECTION = "libs" +HOMEPAGE = "http://qt-project.org" + +QT_MODULE = "qtbase" + +require nativesdk-qt5.inc + +# shared with target version +SRC_URI += " \ + file://0001-Add-linux-oe-g-platform.patch \ + file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ + file://0003-Add-external-hostbindir-option.patch \ + file://0004-qt_functions-temporary-remove-isEmpty-check.patch \ + file://0006-Allow-building-a-separate-qmake-for-the-target.patch \ + file://0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ + file://0008-qt_module-Fix-pkgconfig-replacement.patch \ + file://0009-qt_module-Fix-paths-in-.prl-files.patch \ + file://0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ + file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ + file://0013-Disable-mkv8snapshot.patch \ + file://0014-enables-tslib-device-to-be-read-from-env-variable.patch \ + file://0015-qtbase-allow-build-of-examples.patch \ + file://0021-configure-make-pulseaudio-a-configurable-option.patch \ + file://0022-configure-make-alsa-a-configurable-option.patch \ + file://0023-configure-make-freetype-a-configurable-option.patch \ + file://0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch \ +" + +# specific for nativesdk version +SRC_URI += " \ + file://0001-Always-build-uic.patch \ + file://0001-configure-preserve-built-qmake-and-swap-with-native-.patch \ + file://0001-configure-bump-path-length-from-256-to-512-character.patch \ +" + +PACKAGES = "${PN}-tools-dbg ${PN}-tools" + +PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" + +FILES_${PN}-tools-dbg = " \ + ${OE_QMAKE_PATH_BINS}/.debug \ +" + +FILES_${PN}-tools = " \ + ${OE_QMAKE_PATH_BINS}/* \ +" + +QT_CONFIG_FLAGS += " \ + -reduce-relocations \ + -shared \ + -silent \ + -no-pch \ + -no-rpath \ + -pkg-config \ + ${EXTRA_OECONF} \ +" + +# qtbase is exception, as these are used as install path for sysroots +OE_QMAKE_PATH_HOST_DATA = "${libdir}/${QT_DIR_NAME}" +OE_QMAKE_PATH_HOST_LIBS = "${libdir}" + +do_generate_qt_config_file() { + cat > ${QT_CONF_PATH} <> ${QT_CONF_PATH} < +Date: Mon, 11 Nov 2013 20:27:30 -0500 +Subject: [PATCH] configure: bump path length from 256 to 512 characters + +Increase the path length that gets hardcoded into generated config.cpp file +from 256 to 512 characters, as nativesdk path can be quite long. + +Signed-off-by: Denys Dmytriyenko +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 304d30f..a37a587 100755 +--- a/configure ++++ b/configure +@@ -3870,7 +3870,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ + static const char qt_configure_installation [12+11] = "qt_instdate=`date +%Y-%m-%d`"; + + /* Installation Info */ +-static const char qt_configure_prefix_path_strs[][256 + 12] = { ++static const char qt_configure_prefix_path_strs[][512 + 12] = { + "qt_prfxpath=$QT_INSTALL_PREFIX", + "qt_docspath=$QT_INSTALL_DOCS", + "qt_hdrspath=$QT_INSTALL_HEADERS", +-- +1.8.3.2 + diff --git a/recipes-qt/qt5/qtbase-5.1.1/0001-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase-5.1.1/0001-configure-preserve-built-qmake-and-swap-with-native-.patch new file mode 100644 index 0000000000..048eab769e --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.1.1/0001-configure-preserve-built-qmake-and-swap-with-native-.patch @@ -0,0 +1,29 @@ +From 6cd7ade28662730e5de89a171501e3902b321ffc Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko +Date: Mon, 11 Nov 2013 20:22:34 -0500 +Subject: [PATCH] configure: preserve built qmake and swap with native one + +Let configure script build the real qmake, but right after it's built, swap +it with a native qmake for further internal use, preserving the real one. + +Signed-off-by: Denys Dmytriyenko +--- + configure | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure b/configure +index 140c7b4..304d30f 100755 +--- a/configure ++++ b/configure +@@ -4104,6 +4104,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; + + (cd "$outpath/qmake"; "$MAKE") || exit 2 + fi # Build qmake ++mv "$outpath/bin/qmake" "$outpath/bin/qmake-real" ++mv "$outpath/bin/qmake-native" "$outpath/bin/qmake" + + echo "Running configuration tests..." + +-- +1.8.3.2 +