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>
This commit is contained in:
parent
9b97567e9c
commit
e89e33fd17
|
@ -1,7 +1,7 @@
|
||||||
# This is useful for target recipes to reference native mkspecs
|
# This is useful for target recipes to reference native mkspecs
|
||||||
QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}/${QT_DIR_NAME}"
|
QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}"
|
||||||
|
|
||||||
QMAKE_MKSPEC_PATH = "${STAGING_LIBDIR}/${QT_DIR_NAME}"
|
QMAKE_MKSPEC_PATH = "${STAGING_LIBDIR}"
|
||||||
QMAKE_MKSPEC_PATH_class-native = "${QMAKE_MKSPEC_PATH_NATIVE}"
|
QMAKE_MKSPEC_PATH_class-native = "${QMAKE_MKSPEC_PATH_NATIVE}"
|
||||||
|
|
||||||
# hardcode linux, because that's what 0001-Add-linux-oe-g-platform.patch adds
|
# hardcode linux, because that's what 0001-Add-linux-oe-g-platform.patch adds
|
||||||
|
@ -39,7 +39,7 @@ do_generate_qt_config_file() {
|
||||||
[Paths]
|
[Paths]
|
||||||
Prefix = ${prefix}
|
Prefix = ${prefix}
|
||||||
Binaries = ${bindir}/${QT_DIR_NAME}
|
Binaries = ${bindir}/${QT_DIR_NAME}
|
||||||
Libraries = ${libdir}/${QT_DIR_NAME}
|
Libraries = ${libdir}
|
||||||
Headers = ${includedir}/${QT_DIR_NAME}
|
Headers = ${includedir}/${QT_DIR_NAME}
|
||||||
Data = ${datadir}/${QT_DIR_NAME}
|
Data = ${datadir}/${QT_DIR_NAME}
|
||||||
ArchData = ${libdir}/${QT_DIR_NAME}
|
ArchData = ${libdir}/${QT_DIR_NAME}
|
||||||
|
|
|
@ -55,6 +55,7 @@ EXTRA_OECONF = " \
|
||||||
-release \
|
-release \
|
||||||
-prefix ${prefix} \
|
-prefix ${prefix} \
|
||||||
-bindir ${bindir}/${QT_DIR_NAME} \
|
-bindir ${bindir}/${QT_DIR_NAME} \
|
||||||
|
-libdir ${libdir} \
|
||||||
-headerdir ${includedir}/${QT_DIR_NAME} \
|
-headerdir ${includedir}/${QT_DIR_NAME} \
|
||||||
-archdatadir ${libdir}/${QT_DIR_NAME} \
|
-archdatadir ${libdir}/${QT_DIR_NAME} \
|
||||||
-datadir ${datadir}/${QT_DIR_NAME} \
|
-datadir ${datadir}/${QT_DIR_NAME} \
|
||||||
|
|
|
@ -65,7 +65,7 @@ do_configure_append() {
|
||||||
-no-gcc-sysroot \
|
-no-gcc-sysroot \
|
||||||
-prefix ${prefix} \
|
-prefix ${prefix} \
|
||||||
-bindir ${bindir}/${QT_DIR_NAME} \
|
-bindir ${bindir}/${QT_DIR_NAME} \
|
||||||
-libdir ${libdir}/${QT_DIR_NAME} \
|
-libdir ${libdir} \
|
||||||
-datadir ${datadir}/${QT_DIR_NAME} \
|
-datadir ${datadir}/${QT_DIR_NAME} \
|
||||||
-sysconfdir ${sysconfdir}/${QT_DIR_NAME} \
|
-sysconfdir ${sysconfdir}/${QT_DIR_NAME} \
|
||||||
-docdir ${docdir}/${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
|
# 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')
|
# 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
|
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`
|
TMP=`dirname ${D}/${B}/mkspecs`
|
||||||
while test ${TMP} != ${D}; do
|
while test ${TMP} != ${D}; do
|
||||||
rmdir ${TMP}
|
rmdir ${TMP}
|
||||||
|
|
|
@ -26,7 +26,7 @@ do_configure () {
|
||||||
}
|
}
|
||||||
|
|
||||||
do_install_append () {
|
do_install_append () {
|
||||||
mv ${D}${QMAKE_MKSPEC_PATH}/mkspecs ${D}${libdir}/${QT_DIR_NAME}/mkspecs
|
mv ${D}${QMAKE_MKSPEC_PATH}/mkspecs ${D}${libdir}/mkspecs
|
||||||
TMP=`dirname ${D}/${QMAKE_MKSPEC_PATH}/mkspecs`
|
TMP=`dirname ${D}/${QMAKE_MKSPEC_PATH}/mkspecs`
|
||||||
while test ${TMP} != ${D}; do
|
while test ${TMP} != ${D}; do
|
||||||
rmdir ${TMP}
|
rmdir ${TMP}
|
||||||
|
|
Loading…
Reference in New Issue