From b716195f609de6547cfdfadfd4fd25292a6bbf09 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 14 Sep 2018 12:35:37 +0000 Subject: qmake5_paths: change the default QT_DIR_NAME to be empty * there aren't many people using qt4 and qt5 in the same image anymore, it's time to stop using this work around and to follow default packaging rules Signed-off-by: Martin Jansa --- recipes-python/pyqt5/python-pyqt5_5.10.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-python') diff --git a/recipes-python/pyqt5/python-pyqt5_5.10.1.bb b/recipes-python/pyqt5/python-pyqt5_5.10.1.bb index a9b52d9a..505db59d 100644 --- a/recipes-python/pyqt5/python-pyqt5_5.10.1.bb +++ b/recipes-python/pyqt5/python-pyqt5_5.10.1.bb @@ -48,7 +48,7 @@ do_configure_prepend() { QT_VERSION=`${OE_QMAKE_QMAKE} -query QT_VERSION` echo "[Qt $QT_VERSION]" >> pyqt.cfg echo "pyqt_modules = ${PYQT_MODULES}" >> pyqt.cfg - echo yes | python configure.py --verbose --qmake ${STAGING_BINDIR_NATIVE}/qt5/qmake --configuration pyqt.cfg --sysroot ${STAGING_DIR_HOST} + echo yes | python configure.py --verbose --qmake ${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake --configuration pyqt.cfg --sysroot ${STAGING_DIR_HOST} } do_compile() { -- cgit v1.2.3