diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-26 20:54:26 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-28 13:39:57 +0200 |
| commit | e89e33fd173fc4006218e99ed363ca292d0a9644 (patch) | |
| tree | 51bd67983913daa6c8d21f318a1fa1f7fd894fd1 /recipes-qt/qt5/qtbase.inc | |
| parent | 9b97567e9c527f0677e214268039808c15cdcc60 (diff) | |
qmake_base: remove QT_DIR_NAME from libdir
* using ${libdir}/${QT_DIR_NAME} is causing pkgconfig files to be
installed in this prefix too
* modify ArchData variable to move mkspecs files to qt5 prefix (so that
they don't conflict with qt4)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase.inc')
| -rw-r--r-- | recipes-qt/qt5/qtbase.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 2664d2cb..69251835 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -65,7 +65,7 @@ do_configure_append() { -no-gcc-sysroot \ -prefix ${prefix} \ -bindir ${bindir}/${QT_DIR_NAME} \ - -libdir ${libdir}/${QT_DIR_NAME} \ + -libdir ${libdir} \ -datadir ${datadir}/${QT_DIR_NAME} \ -sysconfdir ${sysconfdir}/${QT_DIR_NAME} \ -docdir ${docdir}/${QT_DIR_NAME} \ @@ -98,7 +98,7 @@ do_install_append() { # qemu built on host breaks do_package, remove it here (will be replaces with right qemu when do_compile is fixed # ERROR: objcopy failed with exit code 1 (cmd was 'arm-oe-linux-gnueabi-objcopy' --only-keep-debug '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/qmake' '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/.debug/qmake') rm -f ${D}/${bindir}/qmake - mv ${D}${B}/mkspecs ${D}${libdir}/${QT_DIR_NAME}/mkspecs + mv ${D}${B}/mkspecs ${D}${libdir}/mkspecs TMP=`dirname ${D}/${B}/mkspecs` while test ${TMP} != ${D}; do rmdir ${TMP} |