* The qt.conf now supports/requires the sysroot option. * Update relevant paths accordingly.
Signed-off-by: Jacob Stiffler <[email protected]> --- meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb index 9aa29ca..fdca2c3 100644 --- a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb +++ b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb @@ -23,8 +23,9 @@ toolchain_create_sdk_env_script_append() { 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_LIBDIR_QT=$SDK_PATH_TARGET${libdir}' >> $script - echo 'export OE_QMAKE_INCDIR_QT=$SDK_PATH_TARGET${includedir}/${QT_DIR_NAME}' >> $script + echo 'export OE_QMAKE_PREFIX_QT=${prefix}' >> $script + echo 'export OE_QMAKE_LIBDIR_QT=${libdir}' >> $script + echo 'export OE_QMAKE_INCDIR_QT=${includedir}/${QT_DIR_NAME}' >> $script echo 'export OE_QMAKE_HOST_BINDIR_QT=$SDK_PATH_NATIVE${bindir_nativesdk}/${QT_BIN_PREFIX}' >> $script echo 'export OE_QMAKE_MOC=$SDK_PATH_NATIVE${bindir_nativesdk}/${QT_BIN_PREFIX}moc${QT_BIN_SUFFIX}' >> $script echo 'export OE_QMAKE_UIC=$SDK_PATH_NATIVE${bindir_nativesdk}/${QT_BIN_PREFIX}uic${QT_BIN_SUFFIX}' >> $script @@ -44,11 +45,12 @@ toolchain_create_sdk_env_script_append() { qt_conf="${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/${QT_BIN_PREFIX}qt.conf" touch $qt_conf echo '[Paths]' >> $qt_conf - echo 'Prefix = $(SDK_PATH_TARGET)' >> $qt_conf + echo 'Prefix = $(OE_QMAKE_PREFIX_QT)' >> $qt_conf echo 'Libraries = $(OE_QMAKE_LIBDIR_QT)' >> $qt_conf echo 'Headers = $(OE_QMAKE_INCDIR_QT)' >> $qt_conf echo 'HostPrefix = $(SDK_PATH_NATIVE)' >> $qt_conf echo 'HostBinaries = $(OE_QMAKE_HOST_BINDIR_QT)' >> $qt_conf + echo 'Sysroot = $(SDK_PATH_TARGET)' >> $qt_conf # make a symbolic link to mkspecs for compatibility with Qt SDK and QTCreator (cd ${SDK_OUTPUT}/${SDKTARGETSYSROOT}; ln -sf .${QT_MKSPECS_LOCATION}/${QT_DIR_NAME}/mkspecs mkspecs;) -- 2.7.4 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
