diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-05-08 15:30:56 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-13 21:54:40 +0200 |
commit | 8739487b1ce2dc2b93fe7ff283c76f6a56919f1b (patch) | |
tree | 686ae246ed10a328597202c31af7ff3b9eb97044 /configure | |
parent | 38dc6ccca0d65fa2df4297de4f4e2a90e7ab2fc6 (diff) |
install host libraries into -hostprefix
... and introduce -hostlibdir configure option for symmetry.
the libraries built for the host have no business in the target prefix.
in principle this code would even support dynamically linked host
libraries, but that's currently unused.
Task-number: QTBUG-30591
Change-Id: I8e600fa4911a020fb0e87fbf7ef2f35647c7c4d5
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Ivan Romanov <drizt@land.ru>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 18 |
1 files changed, 17 insertions, 1 deletions
@@ -1003,6 +1003,7 @@ CFG_SYSROOT= CFG_GCC_SYSROOT="yes" QT_HOST_PREFIX= QT_HOST_BINS= +QT_HOST_LIBS= QT_HOST_DATA= #flags for SQL drivers @@ -1111,7 +1112,7 @@ while [ "$#" -gt 0 ]; do VAL=no ;; #Qt style options that pass an argument - -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-skip|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig|-android-sdk|-android-ndk|-android-ndk-platform|-android-ndk-host|-android-arch|-android-toolchain-version) + -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-skip|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-hostlibdir|-qpa|-qconfig|-android-sdk|-android-ndk|-android-ndk-platform|-android-ndk-host|-android-arch|-android-toolchain-version) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` shift VAL="$1" @@ -1296,6 +1297,9 @@ while [ "$#" -gt 0 ]; do hostbindir) QT_HOST_BINS="$VAL" ;; + hostlibdir) + QT_HOST_LIBS="$VAL" + ;; pkg-config) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_PKGCONFIG="$VAL" @@ -3152,6 +3156,15 @@ if [ -z "$QT_HOST_BINS" ]; then #default fi QT_HOST_BINS=`"$relpath/config.tests/unix/makeabs" "$QT_HOST_BINS"` +if [ -z "$QT_HOST_LIBS" ]; then #default + if $haveHpx; then + QT_HOST_LIBS="$QT_HOST_PREFIX/lib" #fallback + else + QT_HOST_LIBS="$QT_INSTALL_LIBS" + fi +fi +QT_HOST_LIBS=`"$relpath/config.tests/unix/makeabs" "$QT_HOST_LIBS"` + if [ -z "$QT_HOST_DATA" ]; then #default if $haveHpx; then QT_HOST_DATA="$QT_HOST_PREFIX" @@ -3325,6 +3338,8 @@ Installation options: -hostbindir <dir> .. Host executables will be installed to <dir> (default HOSTPREFIX/bin) + -hostlibdir <dir> .. Host libraries will be installed to <dir> + (default HOSTPREFIX/lib) -hostdatadir <dir> . Data used by qmake will be installed to <dir> (default HOSTPREFIX) @@ -3839,6 +3854,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { "qt_ssrtpath=$CFG_SYSROOT", "qt_hpfxpath=$QT_HOST_PREFIX", "qt_hbinpath=$QT_HOST_BINS", + "qt_hlibpath=$QT_HOST_LIBS", "qt_hdatpath=$QT_HOST_DATA", "qt_targspec=$shortxspec", "qt_hostspec=$shortspec", |