summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/nativesdk-qtbase_git.bb
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/nativesdk-qtbase_git.bb')
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb8
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 9fe45543..69e2b3bc 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -89,7 +89,7 @@ QT_CONFIG_FLAGS += " \
89" 89"
90 90
91# qtbase is exception, as these are used as install path for sysroots 91# qtbase is exception, as these are used as install path for sysroots
92OE_QMAKE_PATH_HOST_DATA = "${libdir}/${QT_DIR_NAME}" 92OE_QMAKE_PATH_HOST_DATA = "${libdir}${QT_DIR_NAME}"
93OE_QMAKE_PATH_HOST_LIBS = "${libdir}" 93OE_QMAKE_PATH_HOST_LIBS = "${libdir}"
94 94
95do_generate_qt_config_file() { 95do_generate_qt_config_file() {
@@ -143,7 +143,7 @@ export OE_QMAKE_AR
143export OE_QMAKE_STRIP 143export OE_QMAKE_STRIP
144 144
145# another exception is that we need to run bin/qmake, because EffectivePaths are relative to qmake location 145# another exception is that we need to run bin/qmake, because EffectivePaths are relative to qmake location
146OE_QMAKE_QMAKE_ORIG = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake" 146OE_QMAKE_QMAKE_ORIG = "${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/qmake"
147OE_QMAKE_QMAKE = "bin/qmake" 147OE_QMAKE_QMAKE = "bin/qmake"
148 148
149do_configure() { 149do_configure() {
@@ -268,9 +268,9 @@ do_generate_qt_environment_file() {
268 echo 'export OE_QMAKE_RCC=${OE_QMAKE_PATH_HOST_BINS}/rcc' >> $script 268 echo 'export OE_QMAKE_RCC=${OE_QMAKE_PATH_HOST_BINS}/rcc' >> $script
269 echo 'export OE_QMAKE_QDBUSCPP2XML=${OE_QMAKE_PATH_HOST_BINS}/qdbuscpp2xml' >> $script 269 echo 'export OE_QMAKE_QDBUSCPP2XML=${OE_QMAKE_PATH_HOST_BINS}/qdbuscpp2xml' >> $script
270 echo 'export OE_QMAKE_QDBUSXML2CPP=${OE_QMAKE_PATH_HOST_BINS}/qdbusxml2cpp' >> $script 270 echo 'export OE_QMAKE_QDBUSXML2CPP=${OE_QMAKE_PATH_HOST_BINS}/qdbusxml2cpp' >> $script
271 echo 'export OE_QMAKE_QT_CONFIG=`qmake -query QT_INSTALL_LIBS`/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script 271 echo 'export OE_QMAKE_QT_CONFIG=`qmake -query QT_INSTALL_LIBS`${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script
272 echo 'export OE_QMAKE_PATH_HOST_BINS=${OE_QMAKE_PATH_HOST_BINS}' >> $script 272 echo 'export OE_QMAKE_PATH_HOST_BINS=${OE_QMAKE_PATH_HOST_BINS}' >> $script
273 echo 'export QMAKESPEC=`qmake -query QT_INSTALL_LIBS`/${QT_DIR_NAME}/mkspecs/linux-oe-g++' >> $script 273 echo 'export QMAKESPEC=`qmake -query QT_INSTALL_LIBS`${QT_DIR_NAME}/mkspecs/linux-oe-g++' >> $script
274 274
275 # Use relocable sysroot 275 # Use relocable sysroot
276 sed -i -e 's:${SDKPATHNATIVE}:$OECORE_NATIVE_SYSROOT:g' $script 276 sed -i -e 's:${SDKPATHNATIVE}:$OECORE_NATIVE_SYSROOT:g' $script