From 97f4709e4c5e3facea506cde3c98a4175c01be63 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 12 Dec 2012 06:19:48 +0100 Subject: qt5: move qtbase specific stuff from qt5.inc to qtbase.inc * qt5.inc should be used by all qtmodule.inc * add missing PACKAGES in qt5.inc Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5.inc | 95 ++------------------------------------------------ 1 file changed, 2 insertions(+), 93 deletions(-) (limited to 'recipes-qt/qt5/qt5.inc') diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index ef4dbd36..3ba352cb 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -2,12 +2,6 @@ inherit qmake5_base -SRC_URI += " \ - file://qmake-build.conf.sh \ - file://qmake.conf.sh \ - file://qplatformdefs.h \ -" - # Qt5 is dependent on icu for localization ICU = "icu " ICU_powerpc = "pango" @@ -16,7 +10,7 @@ DEPENDS += "qt5-tools-native virtual/libgl freetype jpeg libpng zlib openssl gli require qt5_arch.inc -QT_MODULE ?= "${PN}" +QT_MODULE ?= "${BPN}" QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm" QT_DISTRO_FLAGS_linuxstdbase = "-sm" @@ -79,76 +73,6 @@ do_configure() { # Avoid problems with the linkers, since we want the linker to be g++ unset LD - - ### Make sure that our mkspecs will eventually end up in STAGING_DATADIR - ${OE_QMAKE_QMAKE} -set OE_CROSS_INSTALL_DATA ${datadir}/${QT_DIR_NAME} - sed -i '/mkspecs\.path/s/QT_HOST_DATA/OE_CROSS_INSTALL_DATA/' qtbase.pro - sed -i '/pritarget/s/QT_HOST_DATA/OE_CROSS_INSTALL_DATA/' mkspecs/features/qt_installs.prf - - ### Same applies to the module headers... - ${OE_QMAKE_QMAKE} -set OE_CROSS_INSTALL_HEADERS ${includedir}/${QT_DIR_NAME} - sed -i 's/QT_INSTALL_HEADERS/OE_CROSS_INSTALL_HEADERS/g' mkspecs/features/qt_installs.prf - - ### Create the mkspec for the target - mkdir -p mkspecs/${TARGET_OS}-oe-g++ - cp -f ${WORKDIR}/qplatformdefs.h mkspecs/${TARGET_OS}-oe-g++ - bash ${WORKDIR}/qmake.conf.sh > mkspecs/${TARGET_OS}-oe-g++/qmake.conf - - ### Stage the base mkspecs so that 'HostData' will find them - mkdir -p ${STAGING_DATADIR}/${QT_DIR_NAME} - cp -r ${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs ${STAGING_DATADIR}/${QT_DIR_NAME}/ - ### Make sure that modules are installed correctly. During configure they will pick this one - ### instead of the one from ${S}/mkspecs... - sed -i '/pritarget/s/QT_HOST_DATA/OE_CROSS_INSTALL_DATA/' \ - ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/features/qt_installs.prf - rm -rf ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/modules* - - ### Remove the old pri files - rm ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/*.pri - - - echo "[Paths]" > $QT_CONF_PATH - echo "Binaries=${bindir}" >> $QT_CONF_PATH - echo "Headers=${includedir}/${QT_DIR_NAME}" >> $QT_CONF_PATH - echo "Documentation=${docdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH - echo "Libraries=${libdir}" >> $QT_CONF_PATH - echo "Plugins=${libdir}/${QT_DIR_NAME}/plugins" >> $QT_CONF_PATH - echo "Data=${datadir}/${QT_DIR_NAME}" >> $QT_CONF_PATH - echo "Translations=${datadir}/${QT_DIR_NAME}/translations" >> $QT_CONF_PATH - echo "Settings=${sysconfdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH - echo "Examples=${bindir}/${QT_DIR_NAME}/examples" >> $QT_CONF_PATH - echo "HostBinaries=${STAGING_BINDIR_NATIVE}" >> $QT_CONF_PATH - echo "HostData=${STAGING_DATADIR}/${QT_DIR_NAME}" >> $QT_CONF_PATH - - ./configure -v \ - -dont-process \ - -opensource -confirm-license \ - -prefix ${prefix} \ - -bindir ${bindir} \ - -libdir ${libdir} \ - -datadir ${datadir}/${QT_DIR_NAME} \ - -sysconfdir ${sysconfdir}/${QT_DIR_NAME} \ - -docdir ${docdir}/${QT_DIR_NAME} \ - -headerdir ${includedir}/${QT_DIR_NAME} \ - -plugindir ${libdir}/${QT_DIR_NAME}/plugins \ - -importdir ${libdir}/${QT_DIR_NAME}/imports \ - -translationdir ${datadir}/${QT_DIR_NAME}/translations \ - -examplesdir ${bindir}/${QT_DIR_NAME}/examples \ - -platform ${TARGET_OS}-oe-g++ \ - -xplatform ${TARGET_OS}-oe-g++ \ - ${QT_CONFIG_FLAGS} - - ### Since we are pointing our host data we need to get them there before compilation - if [ ! -e ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++ ]; then - cp -rf mkspecs/${TARGET_OS}-oe-g++ ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++ - fi - ### qmodule.pri and qconfig.pri contain target specific stuff copy them over as well - cp -f mkspecs/qmodule.pri ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/qmodule.pri - cp -f mkspecs/qconfig.pri ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/qconfig.pri - - ### As we provided the '-dont-process' switch inorder to allow us to stage a few files - ### generated by the configure we need to manually run qmake the generate _all_ the Makefiles (-r) - ${OE_QMAKE_QMAKE} -r -d } do_compile() { @@ -156,28 +80,13 @@ do_compile() { unset CFLAGS CXXFLAGS AR oe_runmake ${EXTRA_ENV} - - # Build qmake for the target arch - cd ${S}/qmake - ${OE_QMAKE_QMAKE} - oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S} } do_install() { oe_runmake install INSTALL_ROOT=${D} - - ### Fix up the binaries to the right location - ### TODO: FIX - install -d ${D}${bindir}/ - mv ${D}/${STAGING_BINDIR_NATIVE}/* ${D}${bindir}/ - rm -rf ${D}/${STAGING_BINDIR_NATIVE}/ - - # Install the right arch qmake - rm ${D}/${bindir}/qmake - install -m 0755 bin/qmake2 ${D}${bindir}/qmake } +PACKAGES .= "${PN}-tools ${PN}-plugins ${PN}-plugins-dbg" FILES_${PN} = "${libdir}/*.so.*" FILES_${PN}-dbg = "${libdir}/.debug/*.so.*" FILES_${PN}-plugins = "${libdir}/${QT_DIR_NAME}/plugins/*" -- cgit v1.2.3