From dee6fc781f5ac77155817b82f9d66787690a3bb3 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 6 Apr 2013 13:15:07 +0200 Subject: [PATCH 12/13] Add -external-hostbindir option for native(sdk) * when cross-compiling it's sometimes useful to use existing tools from machine (or in OpenEmbedded built with separate native recipe) when building for target * this way we can skip bootstraping tools we already have * qt_functions: temporary remove isEmpty check * now we assume that every build will provide QT_EXTERNAL_HOST_BINS value * isEmpty works correctly only with qmake variables (e.g. $$FOO - isEmpty(FOO)), but doesn't work with system properties like $$[FOO]. * cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to host binaries Upstream-Status: Pending is a lot better for upstreaming (and it was already sort of approved by Oswald) but in 5.2.0 I've noticed that he added something similar for android builds Change-Id: I4f6e634bf0b2cb96065ee5c38b9cd8a224c3bd37 Signed-off-by: Martin Jansa Signed-off-by: Simon Busch Signed-off-by: Jonathan Liu Signed-off-by: Martin Jansa --- qmake/property.cpp | 1 + src/corelib/global/qlibraryinfo.cpp | 3 ++- src/corelib/global/qlibraryinfo.h | 1 + tools/configure/configureapp.cpp | 8 ++++++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/qmake/property.cpp b/qmake/property.cpp index 051e056..50da6ed 100644 --- a/qmake/property.cpp +++ b/qmake/property.cpp @@ -67,6 +67,7 @@ static const struct { { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true }, { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true }, { "QT_HOST_LIBS", QLibraryInfo::HostLibrariesPath, true }, + { "QT_EXTERNAL_HOST_BINS", QLibraryInfo::ExternalHostBinariesPath, true }, { "QMAKE_SPEC", QLibraryInfo::HostSpecPath, true }, { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, }; diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index c418c5e..c8c4188 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -348,7 +348,7 @@ QLibraryInfo::isDebugBuild() */ static const struct { - char key[19], value[13]; + char key[21], value[13]; } qtConfEntries[] = { { "Prefix", "." }, { "Documentation", "doc" }, // should be ${Data}/doc @@ -374,6 +374,7 @@ static const struct { { "HostBinaries", "bin" }, { "HostLibraries", "lib" }, { "HostData", "." }, + { "ExternalHostBinaries", "" }, { "TargetSpec", "" }, { "HostSpec", "" }, #endif diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h index 543c4b3..a02e03a 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h @@ -80,6 +80,7 @@ public: HostBinariesPath, HostLibrariesPath, HostDataPath, + ExternalHostBinariesPath, TargetSpecPath, HostSpecPath, LastHostPath = HostSpecPath, diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 6e9d4aa..0ca4daf 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1191,6 +1191,13 @@ void Configure::parseCmdLine() dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); } + else if (configCmdLine.at(i) == "-external-hostbindir") { + ++i; + if (i == argCount) + break; + dictionary[ "QT_EXTERNAL_HOST_BINS" ] = configCmdLine.at(i); + } + else if (configCmdLine.at(i) == "-make-tool") { ++i; if (i == argCount) @@ -4004,6 +4011,7 @@ void Configure::generateQConfigCpp() << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl + << " \"qt_ebinpath=" << formatPath(dictionary["QT_EXTERNAL_HOST_BINS"]) << "\"," << endl << " \"qt_targspec=" << targSpec << "\"," << endl << " \"qt_hostspec=" << hostSpec << "\"," << endl << "#endif" << endl -- 2.3.0