From 8cb51a508cf99fe6b6a93a26cf7eb107875b0dbc Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 10 Aug 2011 12:38:55 +0100 Subject: qt4: replace qt4-tools-native with qt4-native Installs native versions of the Qt libraries in addition to the tools, allowing compilation of external native tools that require Qt libs. PROVIDES qt4-tools-native so it should be a drop-in replacement. Developed with reference to the corresponding qt4-native changes in OE. (From OE-Core rev: a6fd9b8104e8d3cbfce0376811aeeef746ad6889) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/recipes-qt/qt4/qt4-native.inc | 84 +++++++++++++++++++++++++++ meta/recipes-qt/qt4/qt4-native_4.7.3.bb | 13 +++++ meta/recipes-qt/qt4/qt4-tools-native.inc | 76 ------------------------ meta/recipes-qt/qt4/qt4-tools-native_4.7.3.bb | 13 ----- 4 files changed, 97 insertions(+), 89 deletions(-) create mode 100644 meta/recipes-qt/qt4/qt4-native.inc create mode 100644 meta/recipes-qt/qt4/qt4-native_4.7.3.bb delete mode 100644 meta/recipes-qt/qt4/qt4-tools-native.inc delete mode 100644 meta/recipes-qt/qt4/qt4-tools-native_4.7.3.bb (limited to 'meta/recipes-qt') diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc new file mode 100644 index 0000000000..3baea20a1c --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-native.inc @@ -0,0 +1,84 @@ +DESCRIPTION = "Native version of Qt/[X11|Mac|Embedded]" +DEPENDS = "zlib-native dbus-native" +SECTION = "libs" +HOMEPAGE = "http://qt.nokia.com" +PROVIDES = "qt4-tools-native" + +LICENSE = "LGPLv2.1 | GPLv3" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ + file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \ + file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" + +INC_PR = "r11" + +inherit native + +SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ + file://qt-config.patch \ + file://g++.conf \ + file://linux.conf" +S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" + +EXTRA_OECONF = "-prefix ${prefix} \ + -L ${STAGING_LIBDIR_NATIVE} \ + -I ${STAGING_INCDIR_NATIVE} \ + -qt-libjpeg -qt-gif -system-zlib \ + -no-libjpeg -no-libpng -no-libmng -no-libtiff \ + -no-accessibility \ + -no-cups \ + -no-nas-sound \ + -no-nis -no-openssl \ + -verbose -release \ + -embedded -no-freetype -no-glib -no-iconv \ + -exceptions -xmlpatterns \ + -qt3support" + +# yank default -e, otherwise we get the following error: +# moc_qbuffer.cpp: No such file or directory +EXTRA_OEMAKE = " " + +do_configure() { + (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" +} + +TOBUILD = "\ + src/tools/moc \ + src/corelib \ + src/sql \ + src/xml \ + src/network \ + src/tools/uic \ + src/tools/rcc \ + src/xmlpatterns \ + src/dbus \ + src/gui \ + src/testlib \ + src/qt3support \ + tools/linguist/lrelease \ + tools/linguist/lupdate \ +" + +do_compile() { + for i in ${TOBUILD}; do + cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}" + done +} + +do_install() { + install -d ${D}${bindir}/ + install -m 0755 bin/qmake ${D}${bindir}/qmake2 + for i in moc uic rcc lrelease lupdate; do + install -m 0755 bin/${i} ${D}${bindir}/${i}4 + done + + install -d ${D}${datadir}/qt4/ + cp -PfR mkspecs ${D}${datadir}/qt4/ + ln -sf linux-g++ ${D}${datadir}/qt4/mkspecs/${BUILD_OS}-oe-g++ + cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf ${D}${datadir}/qt4/mkspecs/common/ + + install -m 0644 tools/porting/src/q3porting.xml ${D}${datadir}/qt4/ + + for i in ${TOBUILD}; do + cd ${S}/$i && oe_runmake install INSTALL_ROOT=${D} + done +} diff --git a/meta/recipes-qt/qt4/qt4-native_4.7.3.bb b/meta/recipes-qt/qt4/qt4-native_4.7.3.bb new file mode 100644 index 0000000000..5c84d4da61 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-native_4.7.3.bb @@ -0,0 +1,13 @@ +require qt4-native.inc + +PR = "${INC_PR}.1" + +# Find the g++.conf/linux.conf in the right directory. +FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:" + +EXTRA_OECONF += " -no-fast -silent -no-rpath" + +TOBUILD := "src/tools/bootstrap ${TOBUILD}" + +SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe" +SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e" diff --git a/meta/recipes-qt/qt4/qt4-tools-native.inc b/meta/recipes-qt/qt4/qt4-tools-native.inc deleted file mode 100644 index c4a58ed849..0000000000 --- a/meta/recipes-qt/qt4/qt4-tools-native.inc +++ /dev/null @@ -1,76 +0,0 @@ -DESCRIPTION = "Native tools for Qt/[X11|Mac|Embedded] version 4.x" -DEPENDS = "zlib-native dbus-native" -SECTION = "libs" -HOMEPAGE = "http://qt.nokia.com" - -LICENSE = "LGPLv2.1 | GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ - file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \ - file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" - -INC_PR = "r11" - -inherit native - -SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ - file://qt-config.patch \ - file://g++.conf \ - file://linux.conf" -S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" - -EXTRA_OECONF = "-prefix ${prefix} \ - -L ${STAGING_LIBDIR_NATIVE} \ - -I ${STAGING_INCDIR_NATIVE} \ - -qt-libjpeg -qt-gif -system-zlib \ - -no-libjpeg -no-libpng -no-libmng -no-libtiff \ - -no-accessibility \ - -no-cups \ - -no-exceptions \ - -no-nas-sound \ - -no-nis -no-openssl \ - -verbose -release -static \ - -embedded -no-freetype -no-glib -no-iconv \ - -qt3support" - -# yank default -e, otherwise we get the following error: -# moc_qbuffer.cpp: No such file or directory -EXTRA_OEMAKE = " " - -do_configure() { - (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" -} - -TOBUILD = "\ - src/tools/moc \ - src/corelib \ - src/sql \ - src/dbus \ - src/qt3support \ - src/xml \ - src/tools/uic \ - src/tools/rcc \ - src/network \ - tools/linguist/lrelease \ - tools/linguist/lupdate \ -" - -do_compile() { - for i in ${TOBUILD}; do - cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}" - done -} - -do_install() { - install -d ${D}${bindir}/ - install -m 0755 bin/qmake ${D}${bindir}/qmake2 - for i in moc uic rcc lrelease lupdate; do - install -m 0755 bin/${i} ${D}${bindir}/${i}4 - done - - install -d ${D}${datadir}/qt4/ - cp -PfR mkspecs ${D}${datadir}/qt4/ - ln -sf linux-g++ ${D}${datadir}/qt4/mkspecs/${BUILD_OS}-oe-g++ - cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf ${D}${datadir}/qt4/mkspecs/common/ - - install -m 0644 tools/porting/src/q3porting.xml ${D}${datadir}/qt4/ -} diff --git a/meta/recipes-qt/qt4/qt4-tools-native_4.7.3.bb b/meta/recipes-qt/qt4/qt4-tools-native_4.7.3.bb deleted file mode 100644 index 8d292af3b5..0000000000 --- a/meta/recipes-qt/qt4/qt4-tools-native_4.7.3.bb +++ /dev/null @@ -1,13 +0,0 @@ -require qt4-tools-native.inc - -PR = "${INC_PR}.1" - -# Find the g++.conf/linux.conf in the right directory. -FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:" - -EXTRA_OECONF += " -no-fast -silent -no-rpath" - -TOBUILD := "src/tools/bootstrap ${TOBUILD}" - -SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe" -SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e" -- cgit v1.2.3-54-g00ecf