From: Martin Jansa Date: Wed, 19 Dec 2012 16:53:14 +0000 (+0100) Subject: qtbase: don't touch STAGING_DATADIR X-Git-Tag: rev_ivi_2015_02_04~1206 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2ecc3f4e3f208f998dc4517dcd5484264fcdc353;p=scm%2Fbb%2Ftizen-distro.git qtbase: don't touch STAGING_DATADIR (From meta-qt5 rev: 1ecc46ac42a685057c94e1bd30147ea81ab925bf) Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- diff --git a/meta-qt5/recipes-qt/qt5/qtbase.inc b/meta-qt5/recipes-qt/qt5/qtbase.inc index 2784465..4b39791 100644 --- a/meta-qt5/recipes-qt/qt5/qtbase.inc +++ b/meta-qt5/recipes-qt/qt5/qtbase.inc @@ -56,7 +56,6 @@ do_configure_append() { ### Fix up prl and pkgconfig lib paths, by default they will point to /usr/lib ${OE_QMAKE_QMAKE} -set OE_CROSS_INSTALL_LIBS ${STAGING_LIBDIR} sed -i 's/QT_INSTALL_LIBS\/raw/OE_CROSS_INSTALL_LIBS/g' mkspecs/features/qt_module.prf - sed -i 's/QT_INSTALL_LIBS\/raw/OE_CROSS_INSTALL_LIBS/g' ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/features/qt_module.prf ### Remove the old pri files rm ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/*.pri