diff options
64 files changed, 524 insertions, 786 deletions
diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass index d0f59d2cd4..cf3419f824 100644 --- a/classes/qmake2.bbclass +++ b/classes/qmake2.bbclass @@ -5,8 +5,7 @@ inherit qmake_base DEPENDS_prepend = "qmake2-native uicmoc4-native " -export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4" -export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++" +export QMAKESPEC = "${CROSS_DATADIR}/qt4/mkspecs/${TARGET_OS}-oe-g++" export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4" export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34" export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4" @@ -14,7 +13,7 @@ export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc4" export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake2" export OE_QMAKE_LINK = "${CXX}" export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" -export OE_QMAKE_INCDIR_QT = "${QTDIR}/include" -export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib" +export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt4" +export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qt4" export OE_QMAKE_LIBS_QT = "qt" export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" diff --git a/classes/qtopia4core.bbclass b/classes/qtopia4core.bbclass index 86bc7afc2f..d14e68bb64 100644 --- a/classes/qtopia4core.bbclass +++ b/classes/qtopia4core.bbclass @@ -4,8 +4,8 @@ inherit qmake2 # # override variables set by qmake-base to compile QtopiaCore apps # -export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopiacore4" -export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qtopiacore4/" +export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopiacore" +export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qtopiacore" export OE_QMAKE_LIBS_QT = "qt" export OE_QMAKE_LIBS_X11 = "" EXTRA_QMAKEVARS_POST += "LIBS+=-lQtNetwork " diff --git a/classes/xilinx-bsp.bbclass b/classes/xilinx-bsp.bbclass index fd09946061..f657e5be94 100644 --- a/classes/xilinx-bsp.bbclass +++ b/classes/xilinx-bsp.bbclass @@ -34,7 +34,7 @@ fi case "${XILINX_BOARD}" in ML403) oenote "ML403 board setup" - cp -a ${XILINX_BSP_PATH}/ppc405_0/libsrc/linux_2_6_v1_00_a/linux/arch/ppc/platforms/4xx/xparameters/xparameters_ml40x.h \ + cp -pPR ${XILINX_BSP_PATH}/ppc405_0/libsrc/linux_2_6_v1_00_a/linux/arch/ppc/platforms/4xx/xparameters/xparameters_ml40x.h \ ${S}/arch/ppc/platforms/4xx/xparameters/xparameters_ml403.h ;; diff --git a/conf/checksums.ini b/conf/checksums.ini index 76eacce219..eadb6a09a9 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -9446,13 +9446,17 @@ sha256=c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b md5=8012acea71b35c18247bd92c4721589d sha256=abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 +[ftp://ftp.trolltech.com/pub/qt/source/qt-x11-opensource-src-4.3.3.tar.gz] +md5=19678fe35170559cd6a6fa531c57799c +sha256=89934bacc5cee5cb35a231275b0f9948f29483faf9082bed0e7255ce41751570 + [ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.2.0.tar.gz] md5=9519eccf0638c9962f73a7b20da77e0e sha256=8fdbc7da376b22796879d6e3b756f71a8800ed1b35fc88aa76cddffd6f1fd883 -[ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.3.2.tar.gz] -md5=70b729dd5dd8b2b432d685918e1971f1 -sha256=38af7b39e7805d8e3ba81091aa29af8bd38ce7cbbf8e721c8bb7ab810c38d963 +[ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.3.3.tar.gz] +md5=f7022c57ec4cf4f1d5f5c8b8a70a9e5f +sha256=2ed9f5006ac9f63db08bce409a3626141d5f6e8d562e25df5bd97cebc65ec10d [http://keepcool.kf.tu-berlin.de/public/mitarbeiter/sadowski/qtopia-squeak-3.4-2_patched.tar.gz] md5=0e2bab65b62784d8714057624373f70d diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index ffb5380a14..97fed90f21 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -1616,7 +1616,7 @@ PREFERRED_VERSION_qscintilla ?= "1.65-gpl-1.6" PREFERRED_VERSION_qsvn ?= "0.3.0" PREFERRED_VERSION_qt-x11-free ?= "3.3.7" PREFERRED_VERSION_qt-x11-free-native ?= "3.3.5" -PREFERRED_VERSION_qt4-x11-free ?= "4.3.2" +PREFERRED_VERSION_qt4-x11-free ?= "4.3.3" PREFERRED_VERSION_qtplot ?= "0.2" PREFERRED_VERSION_quagga ?= "0.99.8" PREFERRED_VERSION_quake1 ?= "0.0.1" @@ -1893,7 +1893,7 @@ PREFERRED_VERSION_udhcp ?= "0.9.8" PREFERRED_VERSION_ufraw ?= "0.12" PREFERRED_VERSION_uicmoc-native ?= "2.3.10" PREFERRED_VERSION_uicmoc3-native ?= "3.3.5" -PREFERRED_VERSION_uicmoc4-native ?= "4.3.2" +PREFERRED_VERSION_uicmoc4-native ?= "4.3.3" PREFERRED_VERSION_uim ?= "1.3.1" PREFERRED_VERSION_uim-native ?= "1.3.1" PREFERRED_VERSION_uim-tomoe-gtk ?= "0.2.0" diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb index ca2db7e760..262d6afff1 100644 --- a/packages/busybox/busybox_1.00.bb +++ b/packages/busybox/busybox_1.00.bb @@ -94,7 +94,7 @@ pkg_prerm_${PN} () { # providing its files, this will make update-alternatives work, but the update-rc.d part # for syslog, httpd and/or udhcpd will fail if there is no other package providing sh tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX` - cp -a /bin/busybox $tmpdir/ + cp -pPR /bin/busybox $tmpdir/ ln -s /bin/busybox $tmpdir/[ ln -s /bin/busybox $tmpdir/test ln -s /bin/busybox $tmpdir/head diff --git a/packages/gallery/gallery_1.5.5.bb b/packages/gallery/gallery_1.5.5.bb index 9aba2a2f0a..5756e98567 100644 --- a/packages/gallery/gallery_1.5.5.bb +++ b/packages/gallery/gallery_1.5.5.bb @@ -32,7 +32,7 @@ do_compile() { # do_install() { mkdir -p ${D}/${DEST_DIR} ${D}/etc/apache2/modules.d - cp -a ${S} ${D}/${DEST_DIR} + cp -pPR ${S} ${D}/${DEST_DIR} cp ${FILESDIR}/gallery.conf ${D}/etc/apache2/modules.d/95_gallery.conf } diff --git a/packages/glibc/eglibc-package.bbclass b/packages/glibc/eglibc-package.bbclass index a859ac2ca9..702d354591 100644 --- a/packages/glibc/eglibc-package.bbclass +++ b/packages/glibc/eglibc-package.bbclass @@ -150,14 +150,14 @@ do_prep_locale_tree() { treedir=${WORKDIR}/locale-tree rm -rf $treedir mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale - cp -a ${D}${datadir}/i18n $treedir/${datadir}/i18n + cp -pPR ${D}${datadir}/i18n $treedir/${datadir}/i18n # unzip to avoid parsing errors for i in $treedir/${datadir}/i18n/charmaps/*gz; do gunzip $i done - ls ${D}/lib/* | xargs -iBLAH cp -a BLAH $treedir/lib + ls ${D}/lib/* | xargs -iBLAH cp -pPR BLAH $treedir/lib if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* ]; then - cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib + cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib fi install -m 0755 ${D}${bindir}/localedef $treedir/bin } @@ -166,7 +166,7 @@ do_collect_bins_from_locale_tree() { treedir=${WORKDIR}/locale-tree mkdir -p ${D}${libdir} - cp -a $treedir/${libdir}/locale ${D}${libdir} + cp -pPR $treedir/${libdir}/locale ${D}${libdir} } python package_do_split_gconvs () { diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index b96aae37b9..50fae44bf3 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -141,17 +141,17 @@ do_prep_locale_tree() { treedir=${WORKDIR}/locale-tree rm -rf $treedir mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale - cp -a ${D}${datadir}/i18n $treedir/${datadir}/i18n + cp -pPR ${D}${datadir}/i18n $treedir/${datadir}/i18n # unzip to avoid parsing errors for i in $treedir/${datadir}/i18n/charmaps/*gz; do gunzip $i done - ls ${D}/lib/* | xargs -iBLAH cp -a BLAH $treedir/lib + ls ${D}/lib/* | xargs -iBLAH cp -pPR BLAH $treedir/lib if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so ]; then - cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib + cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib fi if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* ]; then - cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib + cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib fi install -m 0755 ${D}${bindir}/localedef $treedir/bin } @@ -160,7 +160,7 @@ do_collect_bins_from_locale_tree() { treedir=${WORKDIR}/locale-tree mkdir -p ${D}${libdir} - cp -a $treedir/${libdir}/locale ${D}${libdir} + cp -pPR $treedir/${libdir}/locale ${D}${libdir} } python package_do_split_gconvs () { diff --git a/packages/linux/linux-dht-walnut_2.6.20.bb b/packages/linux/linux-dht-walnut_2.6.20.bb index 89a776e075..ca94ee809f 100644 --- a/packages/linux/linux-dht-walnut_2.6.20.bb +++ b/packages/linux/linux-dht-walnut_2.6.20.bb @@ -35,11 +35,11 @@ do_stage_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split install -d ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ - cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ } diff --git a/packages/linux/linux-efika_2.6.20.20.bb b/packages/linux/linux-efika_2.6.20.20.bb index 630e5a6274..8ef0af6c78 100644 --- a/packages/linux/linux-efika_2.6.20.20.bb +++ b/packages/linux/linux-efika_2.6.20.20.bb @@ -63,12 +63,12 @@ do_stage_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split install -d ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ install -d ${STAGING_KERNEL_DIR}/include/asm - cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ } do_deploy() { diff --git a/packages/linux/linux-efika_2.6.20.bb b/packages/linux/linux-efika_2.6.20.bb index ddf3ee3257..87c769a1ae 100644 --- a/packages/linux/linux-efika_2.6.20.bb +++ b/packages/linux/linux-efika_2.6.20.bb @@ -60,12 +60,12 @@ do_stage_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split install -d ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ install -d ${STAGING_KERNEL_DIR}/include/asm - cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ } diff --git a/packages/linux/linux-efika_2.6.21+git.bb b/packages/linux/linux-efika_2.6.21+git.bb index 80a4e69a4a..5f8427ef1e 100644 --- a/packages/linux/linux-efika_2.6.21+git.bb +++ b/packages/linux/linux-efika_2.6.21+git.bb @@ -47,12 +47,12 @@ do_stage_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split install -d ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ install -d ${STAGING_KERNEL_DIR}/include/asm - cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ } do_deploy() { diff --git a/packages/linux/linux-magicbox_2.6.18.6.bb b/packages/linux/linux-magicbox_2.6.18.6.bb index 9410294020..bd9a1c4060 100644 --- a/packages/linux/linux-magicbox_2.6.18.6.bb +++ b/packages/linux/linux-magicbox_2.6.18.6.bb @@ -44,11 +44,11 @@ do_stage_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split install -d ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ - cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ } diff --git a/packages/linux/linux-magicbox_2.6.19.2.bb b/packages/linux/linux-magicbox_2.6.19.2.bb index 82576776f3..2c79a94e10 100644 --- a/packages/linux/linux-magicbox_2.6.19.2.bb +++ b/packages/linux/linux-magicbox_2.6.19.2.bb @@ -77,11 +77,11 @@ do_stage_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split install -d ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ - cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ } @@ -93,7 +93,7 @@ do_install_append () { powerpc${TARGET_VENDOR}-${TARGET_OS}-objcopy -O binary -R .note -R .comment -S ${DEPLOY_DIR_IMAGE}/vmlinux \ ${DEPLOY_DIR_IMAGE}/linux.bin gzip -f -9 ${DEPLOY_DIR_IMAGE}/linux.bin - cp -a ${DEPLOY_DIR_IMAGE}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/linux-${PV}-${MACHINE}-${DATETIME}.bin.gz + cp -pPR ${DEPLOY_DIR_IMAGE}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/linux-${PV}-${MACHINE}-${DATETIME}.bin.gz mkimage -A ppc -O linux -T kernel -C gzip -a 00000000 -e 00000000 -n "magicbox"-${PV} \ -d ${DEPLOY_DIR_IMAGE}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${MACHINE}-${DATETIME}.bin rm ${DEPLOY_DIR_IMAGE}/vmlinux diff --git a/packages/linux/linux-ml403-mvista-2.6.x_git.bb b/packages/linux/linux-ml403-mvista-2.6.x_git.bb index 76fa75f65d..77b0bbc326 100644 --- a/packages/linux/linux-ml403-mvista-2.6.x_git.bb +++ b/packages/linux/linux-ml403-mvista-2.6.x_git.bb @@ -33,12 +33,12 @@ do_stage_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers a$ install -d ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ install -d ${STAGING_KERNEL_DIR}/include/asm - cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ } diff --git a/packages/linux/linux-ml403-slab-2.6.x_git.bb b/packages/linux/linux-ml403-slab-2.6.x_git.bb index 75233492eb..f0408f365c 100644 --- a/packages/linux/linux-ml403-slab-2.6.x_git.bb +++ b/packages/linux/linux-ml403-slab-2.6.x_git.bb @@ -56,12 +56,12 @@ do_stage_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers a$ install -d ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ install -d ${STAGING_KERNEL_DIR}/include/asm - cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ } diff --git a/packages/linux/linux-sequoia_2.6.21.bb b/packages/linux/linux-sequoia_2.6.21.bb index 1fa520e914..49c7878ca2 100644 --- a/packages/linux/linux-sequoia_2.6.21.bb +++ b/packages/linux/linux-sequoia_2.6.21.bb @@ -31,12 +31,12 @@ do_stage_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers a$ install -d ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ install -d ${STAGING_KERNEL_DIR}/include/asm - cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ } diff --git a/packages/meta/external-toolchain.bb b/packages/meta/external-toolchain.bb index c483ea26a6..47d9a93a15 100644 --- a/packages/meta/external-toolchain.bb +++ b/packages/meta/external-toolchain.bb @@ -30,21 +30,21 @@ do_stage() { install -d ${STAGING_DIR}/pkgdata/ install -d ${STAGING_DIR_TARGET}/shlibs/ - cp -ar ${prefix}/pkgdata/* ${STAGING_DIR}/pkgdata/ - cp -ar ${prefix}/${TARGET_SYS}/shlibs/* ${STAGING_DIR_TARGET}/shlibs/ + cp -pPRr ${prefix}/pkgdata/* ${STAGING_DIR}/pkgdata/ + cp -pPRr ${prefix}/${TARGET_SYS}/shlibs/* ${STAGING_DIR_TARGET}/shlibs/ if [ -d ${prefix}/ipk ]; then install -d ${DEPLOY_DIR_IPK}/ - cp -ar ${prefix}/ipk/* ${DEPLOY_DIR_IPK}/ + cp -pPRr ${prefix}/ipk/* ${DEPLOY_DIR_IPK}/ fi if [ -d ${prefix}/deb ]; then install -d ${DEPLOY_DIR_DEB}/ - cp -ar ${prefix}/deb/* ${DEPLOY_DIR_DEB}/ + cp -pPRr ${prefix}/deb/* ${DEPLOY_DIR_DEB}/ fi if [ -d ${prefix}/pstage -a "x${DEPLOY_DIR_PSTAGE}" != "x" ]; then install -d ${DEPLOY_DIR_PSTAGE}/ - cp -ar ${prefix}/pstage/* ${DEPLOY_DIR_PSTAGE}/ + cp -pPRr ${prefix}/pstage/* ${DEPLOY_DIR_PSTAGE}/ fi } diff --git a/packages/openmoko2/openmoko-sample2_svn.bb b/packages/openmoko2/openmoko-sample2_svn.bb index c05b6d3618..4c2c5aad46 100644 --- a/packages/openmoko2/openmoko-sample2_svn.bb +++ b/packages/openmoko2/openmoko-sample2_svn.bb @@ -13,12 +13,12 @@ PACKAGE_ARCH_${PN}-src = "all" do_configure_prepend() { install -d ${WORKDIR}/source - cp -a ${S} ${WORKDIR}/source/ + cp -pPR ${S} ${WORKDIR}/source/ find ${WORKDIR}/source -name ".svn"|xargs rm -rf } do_install_append() { install -d ${D}/usr/local/openmoko/source/ - cp -a ${WORKDIR}/source/* ${D}/usr/local/openmoko/source/ + cp -pPR ${WORKDIR}/source/* ${D}/usr/local/openmoko/source/ } diff --git a/packages/qmake/qmake2-native.inc b/packages/qmake/qmake2-native.inc new file mode 100644 index 0000000000..058bf176f9 --- /dev/null +++ b/packages/qmake/qmake2-native.inc @@ -0,0 +1,67 @@ +DESCRIPTION = "TrollTech Makefile Generator" +PRIORITY = "optional" +HOMEPAGE = "http://www.trolltech.com" +SECTION = "devel" +LICENSE = "GPL" +PR = "r2" + +QTVER = "qtopia-core-opensource-src-${QTVERSION}" + +FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2-native" +SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \ + file://0001-fix-mkspecs.patch;patch=1 \ + file://qt-config.patch;patch=1 \ + file://use-lflags-last.patch;patch=1 \ + file://linux-oe-qmake.conf" +S = "${WORKDIR}/${QTVER}" + +# we need the real target system here +CROSS_SYS := "${TARGET_SYS}" +inherit autotools cross + +export QTDIR = "${S}" +EXTRA_OEMAKE = "-e" + +do_configure() { + # Install the OE build templates + for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ + do + install -d ${S}/mkspecs/$template + install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf + ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h + done + + QMAKESPEC= + PLATFORM=${HOST_OS}-oe-g++ + export PLATFORM + # yes, TARGET_SYS is correct, because this is a 'cross'-qmake-native :) :M: + export OE_QMAKE_CC="${CC}" + export OE_QMAKE_CFLAGS="${CFLAGS}" + export OE_QMAKE_CXX="${CXX}" + export OE_QMAKE_CXXFLAGS="-fno-exceptions -fno-rtti ${CXXFLAGS}" + export OE_QMAKE_LDFLAGS="${LDFLAGS}" + export OE_QMAKE_LINK="${CCLD}" + export OE_QMAKE_AR="${AR}" + export OE_QMAKE_STRIP="${STRIP}" + export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic" + export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc" + export OE_QMAKE_RCC="non-existant" + export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake" + export OE_QMAKE_RPATH="-Wl,-rpath-link," + echo yes | ./configure -prefix ${STAGING_DIR}/${CROSS_SYS}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed" +} + +do_compile() { + : +} + +do_stage() { + install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake2 + install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake-qt4 + install -d ${CROSS_DATADIR}/qt4 + cp -PfR mkspecs ${CROSS_DATADIR}/qt4/ +} + +do_install() { + : +} diff --git a/packages/qmake/qmake2-native-2.10a/.mtn2git_empty b/packages/qmake/qmake2-native/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qmake/qmake2-native-2.10a/.mtn2git_empty +++ b/packages/qmake/qmake2-native/.mtn2git_empty diff --git a/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch b/packages/qmake/qmake2-native/0001-fix-mkspecs.patch index abebfdfa27..abebfdfa27 100644 --- a/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch +++ b/packages/qmake/qmake2-native/0001-fix-mkspecs.patch diff --git a/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf b/packages/qmake/qmake2-native/linux-oe-qmake.conf index f58481a693..f58481a693 100644 --- a/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf +++ b/packages/qmake/qmake2-native/linux-oe-qmake.conf diff --git a/packages/qmake/qmake2-native/qt-config.patch b/packages/qmake/qmake2-native/qt-config.patch new file mode 100644 index 0000000000..b2d86de2c5 --- /dev/null +++ b/packages/qmake/qmake2-native/qt-config.patch @@ -0,0 +1,27 @@ +Allow to set a qt.conf from the outside using the environment. This allows +to inject new prefixes and other paths into qmake. This is needed when using +the same qmake binary to build qt/x11 and qt/embedded + +Index: qtopia-core-opensource-src-4.3.3/src/corelib/global/qlibraryinfo.cpp +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/src/corelib/global/qlibraryinfo.cpp 2007-12-25 00:55:32.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/src/corelib/global/qlibraryinfo.cpp 2007-12-25 01:20:18.000000000 +0100 +@@ -42,6 +42,7 @@ + #include "qpointer.h" + #ifdef QT_BUILD_QMAKE + extern QString qmake_libraryInfoFile(); ++#include <stdlib.h> + #else + # include "qcoreapplication.h" + #endif +@@ -107,6 +108,10 @@ + #ifdef QT_BUILD_QMAKE + if(!QFile::exists(qtconfig)) + qtconfig = qmake_libraryInfoFile(); ++ if (!QFile::exists(qtconfig)) { ++ QByteArray config = getenv("QT_CONF_PATH"); ++ qtconfig = config; ++ } + #else + if (!QFile::exists(qtconfig) && QCoreApplication::instance()) { + #ifdef Q_OS_MAC diff --git a/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch b/packages/qmake/qmake2-native/use-lflags-last.patch index 4197dbbf64..4197dbbf64 100644 --- a/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch +++ b/packages/qmake/qmake2-native/use-lflags-last.patch diff --git a/packages/qmake/qmake2-native_2.10a.bb b/packages/qmake/qmake2-native_2.10a.bb index d9071193a9..89b2ae5a82 100644 --- a/packages/qmake/qmake2-native_2.10a.bb +++ b/packages/qmake/qmake2-native_2.10a.bb @@ -1,67 +1,2 @@ -DESCRIPTION = "TrollTech Makefile Generator" -PRIORITY = "optional" -HOMEPAGE = "http://www.trolltech.com" -SECTION = "devel" -LICENSE = "GPL" -PR = "r2" - -QTVER = "qtopia-core-opensource-src-4.3.2" - -SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \ - file://0001-fix-mkspecs.patch;patch=1 \ - file://use-lflags-last.patch;patch=1 \ - file://linux-oe-qmake.conf" -S = "${WORKDIR}/${QTVER}" - -# we need the real target system here -CROSS_SYS := "${TARGET_SYS}" -inherit autotools cross - -export QTDIR = "${S}" -EXTRA_OEMAKE = "-e" - -do_configure() { - # Install the OE build templates - for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ - do - install -d ${S}/mkspecs/$template - install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf - ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h - done - - QMAKESPEC= - PLATFORM=${HOST_OS}-oe-g++ - export PLATFORM - # yes, TARGET_SYS is correct, because this is a 'cross'-qmake-native :) :M: - export OE_QMAKE_CC="${CC}" - export OE_QMAKE_CFLAGS="${CFLAGS}" - export OE_QMAKE_CXX="${CXX}" - export OE_QMAKE_CXXFLAGS="-fno-exceptions -fno-rtti ${CXXFLAGS}" - export OE_QMAKE_LDFLAGS="${LDFLAGS}" - export OE_QMAKE_LINK="${CCLD}" - export OE_QMAKE_AR="${AR}" - export OE_QMAKE_STRIP="${STRIP}" - export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic" - export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc" - export OE_QMAKE_RCC="non-existant" - export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake" - export OE_QMAKE_RPATH="-Wl,-rpath-link," - echo yes | ./configure -prefix ${STAGING_DIR}/${CROSS_SYS}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed" -} - -do_compile() { - : -} - -do_stage() { - install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake2 - install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake-qt4 - install -d ${STAGING_DIR}/${CROSS_SYS}/qt4/ - cp -PfR mkspecs ${STAGING_DIR}/${CROSS_SYS}/qt4/ - install -d ${STAGING_DIR}/${HOST_SYS}/qt4/ - cp -PfR mkspecs ${STAGING_DIR}/${HOST_SYS}/qt4/ -} - -do_install() { - : -} +QTVERSION="4.3.3" +require ${PN}.inc diff --git a/packages/qt/qt4-x11-free_4.3.2.bb b/packages/qt/qt4-x11-free_4.3.2.bb deleted file mode 100644 index 2fa53a4d54..0000000000 --- a/packages/qt/qt4-x11-free_4.3.2.bb +++ /dev/null @@ -1,187 +0,0 @@ -DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version." -SECTION = "x11/libs" -PRIORITY = "optional" -HOMEPAGE = "http://www.trolltech.com" -LICENSE = "GPL QPL" -DEPENDS = "pkgconfig-native uicmoc4-native qmake2-native freetype jpeg virtual/libx11 \ - xft libxext libxrender libxrandr libxcursor dbus openssl" -RDEPENDS_${PN} = "${NONDEV_PACKAGES}" -PROVIDES = "qt4x11" -PR = "r6" - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ - file://0001-cross-compile.patch;patch=1 \ - file://0002-fix-resinit-declaration.patch;patch=1 \ - file://0003-no-tools.patch;patch=1 \ - file://0004-no-qmake.patch;patch=1 \ - file://0005-fix-mkspecs.patch;patch=1 \ - file://0006-freetype-host-includes.patch;patch=1 \ - file://0007-openssl-host-includes.patch;patch=1" -S = "${WORKDIR}/qt-x11-opensource-src-${PV}" - -PARALLEL_MAKE = "" - -inherit qmake_base qt4x11 - -export QTDIR = "${S}" -STAGING_QT_DIR = "${STAGING_DIR}/${TARGET_SYS}/qt4" -EXTRA_OEMAKE = "-e" - -require qt4_arch.inc - -QT_ARCH := "${@qt_arch(d)}" - -# FIXME: -# * add missing options -QT_CONFIG_FLAGS = "-release -shared -qt-zlib -system-libjpeg -no-nas-sound -no-sm -no-libmng -qt-libpng -no-gif -no-xinerama \ - -no-tablet -no-xkb -no-nis -no-cups -no-opengl \ - -no-sse -no-sse2 -no-mmx -no-3dnow \ - -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \ - -qdbus \ - -verbose -stl -no-accessibility \ - -pch -no-glib" - -EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after DEFINES+=QT_NO_XIM INCPATH+=${STAGING_INCDIR} \ - INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ - QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ - AR="${TARGET_PREFIX}ar cqs" \ - MOC="${STAGING_BINDIR_NATIVE}/moc4" UIC="${STAGING_BINDIR_NATIVE}/uic4" MAKE="make -e"' - -do_configure() { - echo "DEFINES -= QT_NO_CAST_TO_ASCII" >>src/qbase.pri - echo "DEFINES += QT_NO_XIM" >>src/qbase.pri - unset QMAKESPEC - ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake - ln -s linux-g++ mkspecs/${TARGET_OS}-oe-g++ - #export QMAKESPEC="linux-oe-g++" - #rm -rf ./mkspecs - #ln -sf ${QMAKE_MKSPEC_PATH} ./mkspecs - echo yes | ./configure -prefix / -platform ${TARGET_OS}-oe-g++ -crossarch ${QT_ARCH} ${QT_CONFIG_FLAGS} -fast \ - -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql -} - -# FIXME: Might want to compile the cross tools for the -dev packages as well... -do_compile() { - unset CFLAGS CXXFLAGS - install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc - install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc - install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic - - oe_runmake ${EXTRA_ENV} -} - -PARTS = "3Support AssistantClient Core DBus Designer DesignerComponents Gui Network Script Sql Svg Test Xml" - -do_stage() { - oe_runmake install INSTALL_ROOT=/ - install -d ${STAGING_QT_DIR} - install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${STAGING_QT_DIR}/bin/rcc - install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${STAGING_QT_DIR}/bin/moc - install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${STAGING_QT_DIR}/bin/uic - sed -i -e 's,^QMAKE_RPATHDIR.*,QMAKE_RPATHDIR=${STAGING_QT_DIR}/lib,g' ${STAGING_QT_DIR}/mkspecs/qconfig.pri - for pcc in AssistantClient DBus Test UiTools ; do - sed -i -e 's,${S}/lib,${STAGING_QT_DIR}/lib,g' ${STAGING_QT_DIR}/lib/pkgconfig/Qt${pcc}.pc - done - install -d ${PKG_CONFIG_DIR}/ - for pc in ${STAGING_QT_DIR}/lib/pkgconfig/*.pc ; do - sed -i -e 's,$(OE_QMAKE_LIBS_X11),-lX11 -lXext,g' $pc - install -m 0644 $pc ${PKG_CONFIG_DIR}/ - done -} - -# FIXME: Might want to call oe_runmake install INSTALL_ROOT=${D}/${prefix} as well... -# FIXME: Might want to install everything into ${libdir}/qt4/* to match the usual packing... -do_install() { - install -d ${D}${libdir} - install -d ${D}${bindir} - install -d ${D}${includedir} - for part in ${PARTS} - do - oe_libinstall -so -C lib libQt$part ${D}${libdir} - done - oe_libinstall -a -C lib libQtUiTools ${D}${libdir} - cp -pPR include/* ${D}${includedir} - cp -pPR plugins ${D}${libdir} - cp -pPR bin/* ${D}${bindir} - - install -d ${D}${bindir}/qt4-examples - for binary in `find examples -perm 0755 -type f` - do - install -m 0755 $binary ${D}${bindir}/qt4-examples/ - done - install -d ${D}${bindir}/qt4-demos - for binary in `find demos -perm 0755 -type f` - do - install -m 0755 $binary ${D}${bindir}/qt4-demos/ - done - rm ${D}${bindir}/rcc ${D}${bindir}/uic ${D}${bindir}/moc -} - -NONDEV_PACKAGES = "libqtcore4 libqtgui4 libqtnetwork4 \ - libqtsql4 libqtsvg4 libqttest4 \ - libqtxml4 \ - libqtdesigner4 libqtdesignercomponents4 \ - libqt3support4 \ - libqtassistantclient4 libqtscript4 \ - libqtdbus4 \ - qt4-assistant qt4-common qt4-designer qt4-demos qt4-examples qt4-linguist \ - qt4-pixeltool qt4-dbus \ - qt4-plugins-accessible qt4-plugins-codecs qt4-plugins-designer qt4-plugins-imageformats qt4-plugins-sqldrivers \ - qt4-plugins-inputmethods qt4-plugins-iconengines" - -PACKAGES += "libqtcore4-dev libqtgui4-dev libqtnetwork4-dev libqtsql4-dev libqtsvg4-dev libqttest4-dev \ - libqtxml4-dev libqtdesigner4-dev libqtdesignercomponents4-dev libqt3support4-dev \ - libqtassistantclient4-dev libqtscript4-dev libqtdbus4-dev \ - ${NONDEV_PACKAGES}" - -ALLOW_EMPTY = "1" -FILES_${PN} = "" - -FILES_libqtcore4 = "${libdir}/libQtCore.so.*" -FILES_libqtcore4-dev = "${libdir}/libQtCore.so" -FILES_libqtgui4 = "${libdir}/libQtGui.so.*" -FILES_libqtgui4-dev = "${libdir}/libQtGui.so" -FILES_libqtnetwork4 = "${libdir}/libQtNetwork.so.*" -FILES_libqtnetwork4-dev = "${libdir}/libQtNetwork.so" -FILES_libqtsql4 = "${libdir}/libQtSql.so.*" -FILES_libqtsql4-dev = "${libdir}/libQtSql.so" -FILES_libqtsvg4 = "${libdir}/libQtSvg.so.*" -FILES_libqtsvg4-dev = "${libdir}/libQtSvg.so" -FILES_libqttest4 = "${libdir}/libQtTest.so.*" -FILES_libqttest4-dev = "${libdir}/libQtTest.so" -FILES_libqtxml4 = "${libdir}/libQtXml.so.*" -FILES_libqtxml4-dev = "${libdir}/libQtXml.so" -FILES_libqtdesigner4 = "${libdir}/libQtDesigner.so.*" -FILES_libqtdesigner4-dev = "${libdir}/libQtDesigner.so" -FILES_libqtdesignercomponents4 = "${libdir}/libQtDesignerComponents.so.*" -FILES_libqtdesignercomponents4-dev = "${libdir}/libQtDesignerComponents.so" -FILES_libqt3support4 = "${libdir}/libQt3Support.so.*" -FILES_libqt3support4-dev = "${libdir}/libQt3Support.so" -FILES_libqtassistantclient4 = "${libdir}/libQtAssistantClient.so.*" -FILES_libqtassistantclient4-dev = "${libdir}/libQtAssistantClient.so" -FILES_libqtscript4 = "${libdir}/libQtScript.so.*" -FILES_libqtscript4-dev = "${libdir}/libQtScript.so" -FILES_libqtdbus4 = "${libdir}/libQtDBus.so.*" -FILES_libqtdbus4-dev = "${libdir}/libQtDBus.so" - -FILES_qt4-plugins-accessible = "${libdir}/plugins/accessible/*.so" -FILES_qt4-plugins-codecs = "${libdir}/plugins/codecs/*.so" -FILES_qt4-plugins-designer = "${libdir}/plugins/designer/*.so" -FILES_qt4-plugins-imageformats = "${libdir}/plugins/imageformats/*.so" -FILES_qt4-plugins-sqldrivers = "${libdir}/plugins/sqldrivers/*.so" -FILES_qt4-plugins-inputmethods = "${libdir}/plugins/inputmethods/*.so" -FILES_qt4-plugins-iconengines = "${libdir}/plugins/iconengines/*.so" - -FILES_qt4-assistant = "${bindir}/*assistant*" -FILES_qt4-designer = "${bindir}/*designer*" -FILES_qt4-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/qm2ts" -FILES_qt4-pixeltool = "${bindir}/pixeltool" -FILES_qt4-dbus = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer" - -FILES_qt4-common = "${bindir}/qtconfig" -FILES_qt4-examples = "${bindir}/qt4-examples/*" -FILES_qt4-demos = "${bindir}/qtdemo ${bindir}/qt4-demos/*" - -FILES_${PN}-dev += "${bindir}/rcc ${bindir}/uic* ${bindir}/moc ${bindir}/qmake ${bindir}/syncqt \ - ${bindir}/qt3to4 ${bindir}/findtr" -FILES_${PN}-dbg += "${bindir}/*/.debug ${plugindir}/.debug" diff --git a/packages/qt/qt4_arch.inc b/packages/qt/qt4_arch.inc deleted file mode 100644 index 6dcbd2bc4a..0000000000 --- a/packages/qt/qt4_arch.inc +++ /dev/null @@ -1,13 +0,0 @@ -def qt_arch(d): - import bb, re - arch = bb.data.getVar('TARGET_ARCH', d, 1) - if re.match("^i.86$", arch): - arch = "i386" - elif re.match("^arm.*", arch): - arch = "arm" - elif arch == "x86_64": - arch = "x86" - elif arch == "mipsel": - arch = "mips" - return arch - diff --git a/packages/qt/qt4-x11-free-4.1.2/.mtn2git_empty b/packages/qt4/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qt/qt4-x11-free-4.1.2/.mtn2git_empty +++ b/packages/qt4/.mtn2git_empty diff --git a/packages/qt/qt4-x11-free-4.3.2/.mtn2git_empty b/packages/qt4/qt4-x11-free-4.1.2/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qt/qt4-x11-free-4.3.2/.mtn2git_empty +++ b/packages/qt4/qt4-x11-free-4.1.2/.mtn2git_empty diff --git a/packages/qt/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch b/packages/qt4/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch index ab943db1ff..ab943db1ff 100644 --- a/packages/qt/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch +++ b/packages/qt4/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch diff --git a/packages/qt/qt4-x11-free-4.1.2/cross-compile.patch b/packages/qt4/qt4-x11-free-4.1.2/cross-compile.patch index 7c8665c9c1..7c8665c9c1 100644 --- a/packages/qt/qt4-x11-free-4.1.2/cross-compile.patch +++ b/packages/qt4/qt4-x11-free-4.1.2/cross-compile.patch diff --git a/packages/qt/qt4-x11-free-4.1.2/fix-asm-constraints.patch b/packages/qt4/qt4-x11-free-4.1.2/fix-asm-constraints.patch index 93fc52d055..93fc52d055 100644 --- a/packages/qt/qt4-x11-free-4.1.2/fix-asm-constraints.patch +++ b/packages/qt4/qt4-x11-free-4.1.2/fix-asm-constraints.patch diff --git a/packages/qt/qt4-x11-free-4.1.2/fix-mkspecs.patch b/packages/qt4/qt4-x11-free-4.1.2/fix-mkspecs.patch index e927df9c7d..e927df9c7d 100644 --- a/packages/qt/qt4-x11-free-4.1.2/fix-mkspecs.patch +++ b/packages/qt4/qt4-x11-free-4.1.2/fix-mkspecs.patch diff --git a/packages/qt/qt4-x11-free-4.1.2/fix-resinit-declaration.patch b/packages/qt4/qt4-x11-free-4.1.2/fix-resinit-declaration.patch index fcd5de6f97..fcd5de6f97 100644 --- a/packages/qt/qt4-x11-free-4.1.2/fix-resinit-declaration.patch +++ b/packages/qt4/qt4-x11-free-4.1.2/fix-resinit-declaration.patch diff --git a/packages/qt/qt4-x11-free-4.1.2/gcc4_1.patch b/packages/qt4/qt4-x11-free-4.1.2/gcc4_1.patch index 392aaf4f5f..392aaf4f5f 100644 --- a/packages/qt/qt4-x11-free-4.1.2/gcc4_1.patch +++ b/packages/qt4/qt4-x11-free-4.1.2/gcc4_1.patch diff --git a/packages/qt/qt4-x11-free-4.1.2/no-qmake.patch b/packages/qt4/qt4-x11-free-4.1.2/no-qmake.patch index 324f44303a..324f44303a 100644 --- a/packages/qt/qt4-x11-free-4.1.2/no-qmake.patch +++ b/packages/qt4/qt4-x11-free-4.1.2/no-qmake.patch diff --git a/packages/qt/qt4-x11-free-4.1.2/no-tools.patch b/packages/qt4/qt4-x11-free-4.1.2/no-tools.patch index 2bda49c9c5..2bda49c9c5 100644 --- a/packages/qt/qt4-x11-free-4.1.2/no-tools.patch +++ b/packages/qt4/qt4-x11-free-4.1.2/no-tools.patch diff --git a/packages/qte/qtopia-core/.mtn2git_empty b/packages/qt4/qt4-x11-free-4.3.3/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qte/qtopia-core/.mtn2git_empty +++ b/packages/qt4/qt4-x11-free-4.3.3/.mtn2git_empty diff --git a/packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch b/packages/qt4/qt4-x11-free-4.3.3/0001-cross-compile.patch index 6e2b8e755e..6e2b8e755e 100644 --- a/packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch +++ b/packages/qt4/qt4-x11-free-4.3.3/0001-cross-compile.patch diff --git a/packages/qt/qt4-x11-free-4.3.2/0002-fix-resinit-declaration.patch b/packages/qt4/qt4-x11-free-4.3.3/0002-fix-resinit-declaration.patch index e479a64a2b..e479a64a2b 100644 --- a/packages/qt/qt4-x11-free-4.3.2/0002-fix-resinit-declaration.patch +++ b/packages/qt4/qt4-x11-free-4.3.3/0002-fix-resinit-declaration.patch diff --git a/packages/qt/qt4-x11-free-4.3.2/0003-no-tools.patch b/packages/qt4/qt4-x11-free-4.3.3/0003-no-tools.patch index 5412c90377..5412c90377 100644 --- a/packages/qt/qt4-x11-free-4.3.2/0003-no-tools.patch +++ b/packages/qt4/qt4-x11-free-4.3.3/0003-no-tools.patch diff --git a/packages/qt/qt4-x11-free-4.3.2/0004-no-qmake.patch b/packages/qt4/qt4-x11-free-4.3.3/0004-no-qmake.patch index 359f6df9d5..359f6df9d5 100644 --- a/packages/qt/qt4-x11-free-4.3.2/0004-no-qmake.patch +++ b/packages/qt4/qt4-x11-free-4.3.3/0004-no-qmake.patch diff --git a/packages/qt/qt4-x11-free-4.3.2/0005-fix-mkspecs.patch b/packages/qt4/qt4-x11-free-4.3.3/0005-fix-mkspecs.patch index 93692699dc..93692699dc 100644 --- a/packages/qt/qt4-x11-free-4.3.2/0005-fix-mkspecs.patch +++ b/packages/qt4/qt4-x11-free-4.3.3/0005-fix-mkspecs.patch diff --git a/packages/qt/qt4-x11-free-4.3.2/0006-freetype-host-includes.patch b/packages/qt4/qt4-x11-free-4.3.3/0006-freetype-host-includes.patch index cc8e115fee..cc8e115fee 100644 --- a/packages/qt/qt4-x11-free-4.3.2/0006-freetype-host-includes.patch +++ b/packages/qt4/qt4-x11-free-4.3.3/0006-freetype-host-includes.patch diff --git a/packages/qt/qt4-x11-free-4.3.2/0007-openssl-host-includes.patch b/packages/qt4/qt4-x11-free-4.3.3/0007-openssl-host-includes.patch index 35b71d9694..35b71d9694 100644 --- a/packages/qt/qt4-x11-free-4.3.2/0007-openssl-host-includes.patch +++ b/packages/qt4/qt4-x11-free-4.3.3/0007-openssl-host-includes.patch diff --git a/packages/qt4/qt4-x11-free.inc b/packages/qt4/qt4-x11-free.inc new file mode 100644 index 0000000000..c758d4aab1 --- /dev/null +++ b/packages/qt4/qt4-x11-free.inc @@ -0,0 +1,28 @@ +DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version." +SECTION = "x11/libs" +PRIORITY = "optional" +HOMEPAGE = "http://www.trolltech.com" +LICENSE = "GPL QPL" +DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor" +PROVIDES = "qt4x11" +PR = "r6" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ + file://0001-cross-compile.patch;patch=1 \ + file://0003-no-tools.patch;patch=1 \ + file://0004-no-qmake.patch;patch=1 \ + file://0005-fix-mkspecs.patch;patch=1" +S = "${WORKDIR}/qt-x11-opensource-src-${PV}" + + +QT_CONFIG_FLAGS += "-no-xinerama -no-tablet -no-xkb -no-opengl" +QT_BASE_NAME = "qt4" +QT_BASE_LIB = "libqt" +QT_LIBRARY_NAME = "Qt" +QT_DIR_NAME = "qt4" +require qt_depends.inc +require qt_configuration.inc +require qt_packaging.inc +require qt_staging.inc + +inherit qt4x11 diff --git a/packages/qt/qt4-x11-free_4.1.2.bb b/packages/qt4/qt4-x11-free_4.1.2.bb index 77fa6dba12..77fa6dba12 100644 --- a/packages/qt/qt4-x11-free_4.1.2.bb +++ b/packages/qt4/qt4-x11-free_4.1.2.bb diff --git a/packages/qt4/qt4-x11-free_4.3.3.bb b/packages/qt4/qt4-x11-free_4.3.3.bb new file mode 100644 index 0000000000..7d30503c07 --- /dev/null +++ b/packages/qt4/qt4-x11-free_4.3.3.bb @@ -0,0 +1,5 @@ +require qt4-x11-free.inc +SRC_URI += " \ + file://0002-fix-resinit-declaration.patch;patch=1 \ + file://0006-freetype-host-includes.patch;patch=1 \ + file://0007-openssl-host-includes.patch;patch=1 " diff --git a/packages/qt4/qt4_arch.inc b/packages/qt4/qt4_arch.inc new file mode 100644 index 0000000000..60ede1db2b --- /dev/null +++ b/packages/qt4/qt4_arch.inc @@ -0,0 +1,23 @@ +inherit siteinfo + +def qt_arch(d): + import bb, re + arch = bb.data.getVar('TARGET_ARCH', d, 1) + if re.match("^i.86$", arch): + arch = "i386" + elif re.match("^arm.*", arch): + arch = "arm" + elif arch == "x86_64": + arch = "x86" + elif arch == "mipsel": + arch = "mips" + return arch + +def qt_endian(d): + import bb + if bb.data.getVar('SITEINFO_ENDIANESS', d, True) == "le": + return "-little-endian" + elif bb.data.getVar('SITEINFO_ENDIANESS', d, True) == "be": + return "-big-endian" + else: + assert False diff --git a/packages/qt4/qt_configuration.inc b/packages/qt4/qt_configuration.inc new file mode 100644 index 0000000000..aa4f8c6c5e --- /dev/null +++ b/packages/qt4/qt_configuration.inc @@ -0,0 +1,82 @@ +require qt4_arch.inc +QT_ARCH := "${@qt_arch(d)}" +QT_ENDIAN = "${@qt_endian(d)}" + +QT_CONFIG_FLAGS = "-release -no-cups -no-accessibility -reduce-relocations \ + -shared -no-nas-sound -no-sm -no-nis \ + -qt-gif -system-libjpeg -system-libpng -system-zlib \ + -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \ + -no-pch -qdbus -stl -glib" + +EXTRA_OEMAKE = "-e" + +EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after \ + INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ + QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ + AR="${TARGET_PREFIX}ar cqs" \ + MOC="${STAGING_BINDIR_NATIVE}/moc4" UIC="${STAGING_BINDIR_NATIVE}/uic4" MAKE="make -e"' + +export QT_CONF_PATH="${WORKDIR}/qt.conf" + +do_configure() { + unset QMAKESPEC + unset QTDIR + ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake + ln -s linux-g++ mkspecs/${TARGET_OS}-oe-g++ + + echo "[Paths]" > $QT_CONF_PATH + echo "Prefix=${prefix}" >> $QT_CONF_PATH + echo "Documentation=${docdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH + echo "Headers=${includedir}/${QT_DIR_NAME}" >> $QT_CONF_PATH + echo "Libraries=${libdir}" >> $QT_CONF_PATH + echo "Binaries=${bindir}" >> $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 "Demos=${bindir}/${QT_DIR_NAME}/demos" >> $QT_CONF_PATH + + echo yes | ./configure -v \ + -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 \ + -translationdir ${datadir}/${QT_DIR_NAME}/translations \ + -examplesdir ${bindir}/${QT_DIR_NAME}/examples \ + -demosdir ${bindir}/${QT_DIR_NAME}/demos \ + -platform ${TARGET_OS}-oe-g++ \ + -xplatform ${TARGET_OS}-oe-g++ \ + -embedded ${QT_ARCH} ${QT_ENDIAN} -fast \ + -crossarch ${QT_ARCH} \ + ${QT_CONFIG_FLAGS} -fast \ + -L${STAGING_LIBDIR} -I${STAGING_INCDIR} \ + -I${STAGING_INCDIR}/freetype2 +} + +do_compile() { + unset CFLAGS CXXFLAGS + install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc + install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc + install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic + + oe_runmake ${EXTRA_ENV} +} + +# +# Fixup some pkgconfig files +# moc_location=/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/bin/moc +# uic_location=/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/bin/uic +# +# Libs: -L${libdir} -lQtNetwork -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/staging/arm-angstrom-linux/lib -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/lib $(LIBS_EXTRA) -lQtCore -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/staging/arm-angstrom-linux/lib -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/lib -lm -lrt -lpthread -ldl +# +do_compile_append() { + cd ${S}/lib/pkgconfig + sed -i s#"-L${S}/lib"##g *.pc + sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# *.pc + sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# *.pc +} diff --git a/packages/qt4/qt_depends.inc b/packages/qt4/qt_depends.inc new file mode 100644 index 0000000000..289b625d0e --- /dev/null +++ b/packages/qt4/qt_depends.inc @@ -0,0 +1,3 @@ +inherit pkgconfig qmake_base + +DEPENDS += " uicmoc4-native qmake2-native freetype jpeg libpng zlib dbus openssl glib-2.0" diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc new file mode 100644 index 0000000000..9c3d0b94d7 --- /dev/null +++ b/packages/qt4/qt_packaging.inc @@ -0,0 +1,150 @@ +NONDEV_PACKAGES = "${QT_BASE_LIB}core4 ${QT_BASE_LIB}gui4 ${QT_BASE_LIB}network4 \ + ${QT_BASE_LIB}sql4 ${QT_BASE_LIB}svg4 ${QT_BASE_LIB}test4 ${QT_BASE_LIB}xml4 \ + ${QT_BASE_LIB}designer4 ${QT_BASE_LIB}designercomponents4 \ + ${QT_BASE_LIB}3support4 ${QT_BASE_LIB}assistantclient4 ${QT_BASE_LIB}script4 \ + ${QT_BASE_LIB}dbus4 ${QT_BASE_LIB}opengl4 \ + ${QT_BASE_NAME}-assistant ${QT_BASE_NAME}-common \ + ${QT_BASE_NAME}-designer \ + ${QT_BASE_NAME}-demos ${QT_BASE_NAME}-examples \ + ${QT_BASE_NAME}-linguist \ + ${QT_BASE_NAME}-pixeltool ${QT_BASE_NAME}-dbus \ + ${QT_BASE_NAME}-plugins-accessible \ + ${QT_BASE_NAME}-plugins-codecs \ + ${QT_BASE_NAME}-plugins-designer \ + ${QT_BASE_NAME}-plugins-imageformats \ + ${QT_BASE_NAME}-plugins-sqldrivers \ + ${QT_BASE_NAME}-plugins-inputmethods \ + ${QT_BASE_NAME}-plugins-iconengines \ + ${QT_BASE_NAME}-fonts " + +DEV_PACKAGES += "${QT_BASE_LIB}core4-dev \ + ${QT_BASE_LIB}gui4-dev \ + ${QT_BASE_LIB}network4-dev \ + ${QT_BASE_LIB}sql4-dev \ + ${QT_BASE_LIB}svg4-dev \ + ${QT_BASE_LIB}test4-dev \ + ${QT_BASE_LIB}xml4-dev \ + ${QT_BASE_LIB}designer4-dev \ + ${QT_BASE_LIB}designercomponents4-dev \ + ${QT_BASE_LIB}3support4-dev \ + ${QT_BASE_LIB}assistantclient4-dev \ + ${QT_BASE_LIB}script4-dev \ + ${QT_BASE_LIB}dbus4-dev \ + ${QT_BASE_LIB}opengl4-dev \ + ${QT_BASE_LIB}uitools4-dev" + +DBG_PACKAGES += "${QT_BASE_LIB}core4-dbg \ + ${QT_BASE_LIB}gui4-dbg \ + ${QT_BASE_LIB}network4-dbg \ + ${QT_BASE_LIB}sql4-dbg \ + ${QT_BASE_LIB}svg4-dbg \ + ${QT_BASE_LIB}test4-dbg \ + ${QT_BASE_LIB}xml4-dbg \ + ${QT_BASE_LIB}designer4-dbg \ + ${QT_BASE_LIB}designercomponents4-dbg \ + ${QT_BASE_LIB}3support4-dbg \ + ${QT_BASE_LIB}assistantclient4-dbg \ + ${QT_BASE_LIB}script4-dbg \ + ${QT_BASE_LIB}dbus4-dbg \ + ${QT_BASE_LIB}opengl4-dbg " + + +PACKAGES += "${DEV_PACKAGES} ${NONDEV_PACKAGES} ${DBG_PACKAGES}" + +ALLOW_EMPTY_${PN} = "1" +FILES_${PN} = "" +FILES_${PN}-dev = " ${includedir}/${QT_DIR_NAME}/Qt/*" +FILES_${PN}-dbg = "${bindir}/*/.debug ${libdir}/${QT_DIR_NAME}/plugins/*/.debug/*.so" +RDEPENDS_${PN} = "${NONDEV_PACKAGES}" +RDEPENDS_${PN}-dev = "${DEV_PACKAGES}" +RDEPENDS_${PN}-dbg = "${DBG_PACKAGES}" + +def qt_default_dev(name): + return """${libdir}/lib${QT_LIBRARY_NAME}%(name)s.la + ${libdir}/lib${QT_LIBRARY_NAME}%(name)s.prl + ${libdir}/lib${QT_LIBRARY_NAME}%(name)s.so + ${includedir}/${QT_DIR_NAME}/Qt%(name)s* + ${libdir}/pkgconfig/${QT_LIBRARY_NAME}%(name)s.pc""" % locals() + + +FILES_${QT_BASE_LIB}core4 = "${libdir}/lib${QT_LIBRARY_NAME}Core.so.*" +FILES_${QT_BASE_LIB}core4-dev = "${@qt_default_dev('Core')}" +FILES_${QT_BASE_LIB}core4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Core*" +FILES_${QT_BASE_LIB}gui4 = "${libdir}/lib${QT_LIBRARY_NAME}Gui.so.*" +FILES_${QT_BASE_LIB}gui4-dev = "${@qt_default_dev('Gui')}" +FILES_${QT_BASE_LIB}gui4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Gui*" +FILES_${QT_BASE_LIB}network4 = "${libdir}/lib${QT_LIBRARY_NAME}Network.so.*" +FILES_${QT_BASE_LIB}network4-dev = "${@qt_default_dev('Network')}" +FILES_${QT_BASE_LIB}network4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Network*" +FILES_${QT_BASE_LIB}sql4 = "${libdir}/lib${QT_LIBRARY_NAME}Sql.so.*" +FILES_${QT_BASE_LIB}sql4-dev = "${@qt_default_dev('Sql')}" +FILES_${QT_BASE_LIB}sql4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Sql*" +FILES_${QT_BASE_LIB}svg4 = "${libdir}/lib${QT_LIBRARY_NAME}Svg.so.*" +FILES_${QT_BASE_LIB}svg4-dev = "${@qt_default_dev('Svg')}" +FILES_${QT_BASE_LIB}svg4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Svg*" +FILES_${QT_BASE_LIB}test4 = "${libdir}/lib${QT_LIBRARY_NAME}Test.so.*" +FILES_${QT_BASE_LIB}test4-dev = "${@qt_default_dev('Test')}" +FILES_${QT_BASE_LIB}test4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Test*" +FILES_${QT_BASE_LIB}xml4 = "${libdir}/lib${QT_LIBRARY_NAME}Xml.so.*" +FILES_${QT_BASE_LIB}xml4-dev = "${@qt_default_dev('Xml')}" +FILES_${QT_BASE_LIB}xml4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Xml*" +FILES_${QT_BASE_LIB}designer4 = "${libdir}/lib${QT_LIBRARY_NAME}Designer.so.*" +FILES_${QT_BASE_LIB}designer4-dev = "${@qt_default_dev('Designer')}" +FILES_${QT_BASE_LIB}designer4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Designer*" +FILES_${QT_BASE_LIB}designercomponents4 = "${libdir}/lib${QT_LIBRARY_NAME}DesignerComponents.so.*" +FILES_${QT_BASE_LIB}designercomponents4-dev = "${@qt_default_dev('DesignerComponents')}" +FILES_${QT_BASE_LIB}designercomponents4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}DesignerComponents*" +FILES_${QT_BASE_LIB}3support4 = "${libdir}/lib${QT_LIBRARY_NAME}3Support.so.*" +FILES_${QT_BASE_LIB}3support4-dev = "${@qt_default_dev('3Support')}" +FILES_${QT_BASE_LIB}3support4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}3Support*" +FILES_${QT_BASE_LIB}assistantclient4 = "${libdir}/lib${QT_LIBRARY_NAME}AssistantClient.so.*" +FILES_${QT_BASE_LIB}assistantclient4-dev = "${@qt_default_dev('AssistantClient')} ${includedir}/${QT_DIR_NAME}/QtAssistant*" +FILES_${QT_BASE_LIB}assistantclient4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}AssistantClient*" +FILES_${QT_BASE_LIB}script4 = "${libdir}/lib${QT_LIBRARY_NAME}Script.so.*" +FILES_${QT_BASE_LIB}script4-dev = "${@qt_default_dev('Script')}" +FILES_${QT_BASE_LIB}script4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Script*" +FILES_${QT_BASE_LIB}dbus4 = "${libdir}/lib${QT_LIBRARY_NAME}DBus.so.*" +FILES_${QT_BASE_LIB}dbus4-dev = "${@qt_default_dev('DBus')}" +FILES_${QT_BASE_LIB}dbus4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}DBus*" +FILES_${QT_BASE_LIB}opengl4 = "${libdir}/lib${QT_LIBRARY_NAME}OpenGL.so.*" +FILES_${QT_BASE_LIB}opengl4-dev = "${@qt_default_dev('OpenGL')}" +FILES_${QT_BASE_LIB}opengl4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}OpenGL*" +FILES_${QT_BASE_LIB}uitools4-dev = "${libdir}/lib${QT_LIBRARY_NAME}UiTools* ${includedir}/${QT_DIR_NAME}/QtUiTools* ${libdir}/pkgconfig/${QT_LIBRARY_NAME}UiTools.pc" + + +FILES_${QT_BASE_NAME}-plugins-accessible = "${libdir}/${QT_DIR_NAME}/plugins/accessible/*.so" +FILES_${QT_BASE_NAME}-plugins-codecs = "${libdir}/${QT_DIR_NAME}/plugins/codecs/*.so" +FILES_${QT_BASE_NAME}-plugins-designer = "${libdir}/${QT_DIR_NAME}/plugins/designer/*.so" +FILES_${QT_BASE_NAME}-plugins-imageformats = "${libdir}/${QT_DIR_NAME}/plugins/imageformats/*.so" +FILES_${QT_BASE_NAME}-plugins-sqldrivers = "${libdir}/${QT_DIR_NAME}/plugins/sqldrivers/*.so" +FILES_${QT_BASE_NAME}-plugins-inputmethods = "${libdir}/${QT_DIR_NAME}/plugins/inputmethods/*.so" +FILES_${QT_BASE_NAME}-plugins-iconengines = "${libdir}/${QT_DIR_NAME}/plugins/iconengines/*.so" + +FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant*" +FILES_${QT_BASE_NAME}-designer = "${bindir}/*designer*" +FILES_${QT_BASE_NAME}-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/qm2ts" +FILES_${QT_BASE_NAME}-pixeltool = "${bindir}/pixeltool" +FILES_${QT_BASE_NAME}-dbus = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer" + +FILES_${QT_BASE_NAME}-common = "${bindir}/qtconfig" +FILES_${QT_BASE_NAME}-examples = "${bindir}/${QT_BASE_NAME}/examples/*" +FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo ${bindir}/${QT_BASE_NAME}/demos/*" + +FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts" + +python populate_packages_prepend() { + translationdir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d) + do_split_packages(d, translationdir, '^qt_(.*)\.qm$', '${QT_DIR_NAME}-translation-%s', '{PN} translation for %s', extra_depends='' ) +} + + +do_install() { + oe_runmake install INSTALL_ROOT=${D} + + # These are host binaries, we should only use them in staging + rm -rf ${D}/${bindir}/qmake + rm -rf ${D}/${datadir}/${QT_DIR_NAME}/mkspecs + + install -d ${D}/${libdir}/fonts + touch ${D}/${libdir}/fonts/fontdir +} diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc new file mode 100644 index 0000000000..ecfe0bb321 --- /dev/null +++ b/packages/qt4/qt_staging.inc @@ -0,0 +1,25 @@ +# Fixing up some Qt .pc files +do_stage_append() { + cd ${STAGING_LIBDIR}/pkgconfig + sed -i s#"-L${S}/lib"##g Qt*.pc + sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# Qt*.pc + sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# Qt*.pc +} + +STAGE_TEMP = "${WORKDIR}/temp-staging" +do_stage() { + rm -rf ${STAGE_TEMP} + mkdir -p ${STAGE_TEMP} + oe_runmake install INSTALL_ROOT=${STAGE_TEMP} + + install -d ${STAGING_INCDIR}/${QT_DIR_NAME} + install -d ${STAGING_LIBDIR}/${QT_DIR_NAME} + cp -pPRf ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR}/${QT_DIR_NAME}/ + + for i in ${STAGE_TEMP}/${libdir}/*.la + do + oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la) ${STAGING_LIBDIR}/qtopiacore4 + done + + rm -rf ${STAGE_TEMP} +} diff --git a/packages/qt4/qtopia-core.inc b/packages/qt4/qtopia-core.inc new file mode 100644 index 0000000000..92d61b0776 --- /dev/null +++ b/packages/qt4/qtopia-core.inc @@ -0,0 +1,27 @@ +SUMMARY = "Qt is a versatile cross-platform application framework -- this is the QtopiaCore/Embedded version." +SECTION = "libs" +LICENSE = "GPL" +PRIORITY = "optional" +HOMEPAGE = "http://www.trolltech.com" +DEPENDS += "tslib" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \ + file://0003-no-tools.patch;patch=1 \ + file://0004-no-qmake.patch;patch=1 \ + file://0005-fix-mkspecs.patch;patch=1" +S = "${WORKDIR}/qtopia-core-opensource-src-${PV}" + + +QT_CONFIG_FLAGS += " \ + -nomake demos -nomake examples -nomake tools \ + -qt-mouse-tslib -qt-gfx-transformed -embedded ${QT_ARCH}" +QT_BASE_NAME = "qtopiacore" +QT_BASE_LIB = "libqtopiacore" +QT_LIBRARY_NAME = "Qt" +QT_DIR_NAME = "qtopia" +require qt_depends.inc +require qt_configuration.inc +require qt_packaging.inc +require qt_staging.inc + +inherit qtopia4core diff --git a/packages/qt4/qtopia-core/.mtn2git_empty b/packages/qt4/qtopia-core/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qt4/qtopia-core/.mtn2git_empty diff --git a/packages/qte/qtopia-core/linux-oe-qmake.conf b/packages/qt4/qtopia-core/linux-oe-qmake.conf index fc5ac6dc5c..fc5ac6dc5c 100644 --- a/packages/qte/qtopia-core/linux-oe-qmake.conf +++ b/packages/qt4/qtopia-core/linux-oe-qmake.conf diff --git a/packages/qt4/qtopia-core_4.2.0.bb b/packages/qt4/qtopia-core_4.2.0.bb new file mode 100644 index 0000000000..bd54419686 --- /dev/null +++ b/packages/qt4/qtopia-core_4.2.0.bb @@ -0,0 +1 @@ +require ${PN}.inc diff --git a/packages/qt4/qtopia-core_4.3.3.bb b/packages/qt4/qtopia-core_4.3.3.bb new file mode 100644 index 0000000000..65f0203ea0 --- /dev/null +++ b/packages/qt4/qtopia-core_4.3.3.bb @@ -0,0 +1 @@ +require qtopia-core.inc diff --git a/packages/qte/qtopia-core_4.2.0.bb b/packages/qte/qtopia-core_4.2.0.bb deleted file mode 100644 index ab07ecf35d..0000000000 --- a/packages/qte/qtopia-core_4.2.0.bb +++ /dev/null @@ -1,218 +0,0 @@ -DESCRIPTION = "Qtopia Core (aka: Qt/Embedded)" -SECTION = "libs" -LICENSE = "GPL" -PRIORITY = "optional" -HOMEPAGE = "http://www.trolltech.com" -DEPENDS = "glib-2.0 freetype dbus-glib tslib" - -PR = "r2" - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \ - file://linux-oe-qmake.conf" - -S = "${WORKDIR}/qtopia-core-opensource-src-${PV}" - -inherit pkgconfig - -# I'm not sure about the globals QTDIR and QTOPIADIR, or if they're even -# needed. On the same issue, I'm not sure what the best place for all the -# Qtopia Core related files is. For now, I've just put the libraries in -# ${libdir}, the includes in ${includedir} etc. Other possibilities are -# to sandbox everything (e.g., in /usr/local/Trolltech or /opt/Qtopia oslt), -# or to put libraries in /usr/lib/qtopia (or /usr/lib/qt4) etc. As said, -# I'm fine with this, but I'm also fine with another solution. - -# set QTDIR and QTOPIADIR globally (change QTOPIA dir to QTDIR?) -# This should be the default for other packages: -# export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4" -# export QTOPIADIR = "${STAGING_DIR}/${HOST_SYS}/qtopia" -export QTDIR = "${S}" -export QTOPIADIR = "${S}" - -# Qmake gets confused by environment variables, as it builds both HOST -# and TARGET objects. The correct compiler settings come from the mkspec -# and are set with the OE_QMAKE_ variables -PARALLEL_MAKE = "" -EXTRA_OEMAKE = " MAKEFLAGS= " - -# This stuff could also be done by inheriting qmake, but I didn't want to -# bother with the qmake separation from the Qtopia configure. This separation -# is probably nothing more than a patch on the configure and setting some -# environment variables to use our own qmake/moc/uic, but that's something -# to figure out later. -export OE_QMAKE_CC="${CC}" -export OE_QMAKE_CFLAGS="${CFLAGS}" -export OE_QMAKE_CXX="${CXX}" -export OE_QMAKE_CXXFLAGS="-fno-exceptions ${CXXFLAGS}" -export OE_QMAKE_LDFLAGS="${LDFLAGS}" -export OE_QMAKE_LINK="${CXX}" -export OE_QMAKE_AR="${AR}" -export OE_QMAKE_RANLIB="${RANLIB}" -export OE_QMAKE_STRIP="echo" -export OE_QMAKE_RPATH="-Wl,-rpath-link," -export OE_QMAKE_INCDIR_QT="${QTDIR}/include" -export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" -export OE_QMAKE_INCDIR_QTOPIA="${QTOPIADIR}/include" -export OE_QMAKE_LIBDIR_QTOPIA="${QTOPIADIR}/lib" - -require qte-functions.inc -QT_ARCH := "${@qte_arch(d)}" - -# FIXME use info.bbclass once it has been commited -QT_ENDIAN = "-little-endian" - -# We don't build the examples and demos atm. They're quite big and not used -# frequently, only for testing maybe. Feel free to change and to package -# them separately. -QT_CONFIG_FLAGS = "-release \ - -no-cups -no-accessibility \ - -nomake demos -nomake examples -nomake tools \ - -qt-mouse-tslib" - -do_configure() { - # Install the OE build templates (something which might be done - # by inheriting qmake) - for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ - do - install -d ${S}/mkspecs/$template - install -m 0644 ${WORKDIR}/linux-oe-qmake.conf \ - ${S}/mkspecs/$template/qmake.conf - ln -sf ../linux-g++/qplatformdefs.h \ - ${S}/mkspecs/$template/qplatformdefs.h - done - - # The Qmake Makefile generation doesn't like these environment - # variables, as they mess up the HOST tools builds - unset CC - unset CXX - unset CFLAGS - unset CXXFLAGS - unset LDFLAGS - - # For rationale behind the installation locations, see remark above - echo yes | ./configure -v \ - -prefix ${prefix} \ - -bindir ${bindir} \ - -libdir ${libdir} \ - -docdir ${docdir}/qtopia \ - -headerdir ${includedir} \ - -plugindir ${datadir}/qtopia/plugins \ - -datadir ${datadir} \ - -translationdir ${datadir}/qtopia/translations \ - -sysconfdir ${sysconfdir} \ - -examplesdir ${bindir}/qtopia/examples \ - -demosdir ${bindir}/qtopia/demos \ - -embedded ${QT_ARCH} ${QT_ENDIAN} -fast \ - -xplatform linux-oe-g++ \ - ${QT_CONFIG_FLAGS} \ - -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -} - -do_install() { - oe_runmake install INSTALL_ROOT=${D} - - # These are host binaries, we should only use them in staging - rm -rf ${D}/${bindir} - rm -rf ${D}/${datadir}/mkspecs - - touch ${D}/${libdir}/fonts/fontdir - - #TT is still new to pkgconfig, so fix it up - install -d ${D}${libdir}/pkgconfig - mv ${D}/${libdir}/*.pc ${D}${libdir}/pkgconfig/ -} - -# We might want to package all the libraries separately, so you can really -# fine-tune what to install. This is e.g. done in qt4-x11-free_4.1.2.bb. -# What should these packages be called? I'm tempted to call them the same -# as in qt4 version, as the API is supposed to be compatible, e.g. -# libqtcore4 and libqtgui4. This will however conflict if you have QT and -# Qtopia, but this is something you don't want anyway, I guess. -# Another solution is making virtual/libqtfoo4, and DEPENDing on that one -# and let both the PACKAGES in QT and Qtopia PROVIDE these. The packages -# themselves could then be called libqtopiafoo4. -# I'll postpone this discussion by not making separate Qtopia packages. - -# Also, I don't package the plugins and translations atm, I don't use them -# and I don't feel like thinking about a sensible separation. - -PACKAGES =+ " libqtcore libqtcore-dev libqtcore-dbg \ - libqtxml libqtxml-dev libqtxml-dbg \ - libqtgui libqtgui-dev libqtgui-dbg \ - libqtsql libqtsql-dev libqtsql-dbg \ - libqtnetwork libqtnetwork-dev libqtnetwork-dbg \ - libqtsvg libqtsvg-dev libqtsvg-dbg \ - libqt3support libqt3support-dev libqt3support-dbg \ - qtopia-core-plugins qtopia-core-plugins-dbg\ - " - -PACKAGES += " ${PN}-fonts " - -# The default included fonts are around 75MB and consist of a number of -# FreeType-renderable fonts as well as QPF (Qtopia Prerendered Fonts). -# As FreeType is generally slow on embedded platforms, and 75MB is -# quite huge, we downsize the fonts dir in the do_install. I've decided -# to include only the QPF (Helvetica and Fixed), amounting to 500KB. This -# also results in tremendously faster application startup time. -FILES_libqtcore += " ${libdir}/fonts/helvetic* ${libdir}/fonts/fixed* ${D}/${libdir}/fonts/fontdir" -FILES_${PN}-fonts = "${libdir}/fonts" - -FILES_qtopia-core-plugins += "${datadir}/qtopia/plugins/*/*.so" -FILES_qtopia-core-plugins-dbg += "${datadir}/qtopia/plugins/*/.debug/*.so" - -FILES_libqtcore += "${libdir}/libQtCore.so.*" -FILES_libqtxml += "${libdir}/libQtXml.so.*" -FILES_libqtgui += "${libdir}/libQtGui.so.*" -FILES_libqtsql += "${libdir}/libQtSql.so.*" -FILES_libqtnetwork += "${libdir}/libQtNetwork.so.*" -FILES_libqtsvg += "${libdir}/libQtSvg.so.*" -FILES_libqt3support += "${libdir}/libQt3Support.so.*" - -FILES_libqtcore-dev += "${libdir}/*QtCore.*" -FILES_libqtxml-dev += "${libdir}/*QtXml.*" -FILES_libqtgui-dev += "${libdir}/*QtGui.*" -FILES_libqtsql-dev += "${libdir}/*QtSql.*" -FILES_libqtnetwork-dev += "${libdir}/*QtNetwork.*" -FILES_libqtsvg-dev += "${libdir}/*QtSvg.*" -FILES_libqt3support-dev += "${libdir}/*Qt3Support.*" - -FILES_libqtcore-dbg += "${libdir}/.debug/libQtCore*" -FILES_libqtxml-dbg += "${libdir}/.debug/libQtXml*" -FILES_libqtgui-dbg += "${libdir}/.debug/libQtGui*" -FILES_libqtsql-dbg += "${libdir}/.debug/libQtSql*" -FILES_libqtnetwork-dbg += "${libdir}/.debug/libQtNetwork*" -FILES_libqtsvg-dbg += "${libdir}/.debug/libQtSvg*" -FILES_libqt3support-dbg += "${libdir}/.debug/libQt3Support*" - - -python populate_packages_prepend() { - translationdir = bb.data.expand('${datadir}/qtopia/translations/', d) - do_split_packages(d, translationdir, '^qt_(.*)\.qm$', 'qtopia-translation-%s', 'Qtopia translation for %s', extra_depends='' ) -} - - - -STAGE_TEMP = "${WORKDIR}/temp-staging" -do_stage() { - rm -rf ${STAGE_TEMP} - mkdir -p ${STAGE_TEMP} - oe_runmake install INSTALL_ROOT=${STAGE_TEMP} - - cp -af ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR} - - for i in ${STAGE_TEMP}/${libdir}/*.la - do - oe_libinstall -C ${STAGE_TEMP}/${libdir} \ - -so $(basename $i .la) ${STAGING_LIBDIR} - done - - # Install qmake/moc/uic/rcc in staging (is this needed?) - install -m 0755 ${STAGE_TEMP}/${bindir}/rcc ${STAGING_BINDIR} - install -m 0755 ${STAGE_TEMP}/${bindir}/moc ${STAGING_BINDIR} - install -m 0755 ${STAGE_TEMP}/${bindir}/uic ${STAGING_BINDIR} - install -m 0755 ${STAGE_TEMP}/${bindir}/qmake ${STAGING_BINDIR} - # what about mkspecs? - - rm -rf ${STAGE_TEMP} -} - diff --git a/packages/qte/qtopia-core_4.3.2.bb b/packages/qte/qtopia-core_4.3.2.bb deleted file mode 100644 index c486ba164f..0000000000 --- a/packages/qte/qtopia-core_4.3.2.bb +++ /dev/null @@ -1,222 +0,0 @@ -SUMMARY = "QtopiaCore" -SECTION = "libs" -LICENSE = "GPL" -PRIORITY = "optional" -HOMEPAGE = "http://www.trolltech.com" -DEPENDS = "freetype tslib" - -PR = "r0" - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \ - file://linux-oe-qmake.conf" - -S = "${WORKDIR}/qtopia-core-opensource-src-${PV}" - -inherit pkgconfig - -# Qmake gets confused by environment variables, as it builds both HOST -# and TARGET objects. The correct compiler settings come from the mkspec -# and are set with the OE_QMAKE_ variables -PARALLEL_MAKE = "" -EXTRA_OEMAKE = " MAKEFLAGS= " - -# This stuff could also be done by inheriting qmake, but I didn't want to -# bother with the qmake separation from the Qtopia configure. This separation -# is probably nothing more than a patch on the configure and setting some -# environment variables to use our own qmake/moc/uic, but that's something -# to figure out later. -export OE_QMAKE_CC="${CC}" -export OE_QMAKE_CFLAGS="${CFLAGS}" -export OE_QMAKE_CXX="${CXX}" -export OE_QMAKE_CXXFLAGS="-fno-exceptions ${CXXFLAGS}" -export OE_QMAKE_LDFLAGS="${LDFLAGS}" -export OE_QMAKE_LINK="${CXX}" -export OE_QMAKE_AR="${AR}" -export OE_QMAKE_RANLIB="${RANLIB}" -export OE_QMAKE_STRIP="echo" -export OE_QMAKE_RPATH="-Wl,-rpath-link," -export OE_QMAKE_INCDIR_QT="${QTDIR}/include" -export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" -export OE_QMAKE_INCDIR_QTOPIA="${QTOPIADIR}/include" -export OE_QMAKE_LIBDIR_QTOPIA="${QTOPIADIR}/lib" - -require qte-functions.inc -QT_ARCH := "${@qte_arch(d)}" - -# FIXME use info.bbclass once it has been commited -QT_ENDIAN = "-little-endian" - -# We don't build the examples and demos atm. They're quite big and not used -# frequently, only for testing maybe. Feel free to change and to package -# them separately. -QT_CONFIG_FLAGS = "-release \ - -no-cups -no-accessibility \ - -nomake demos -nomake examples -nomake tools -reduce-relocations \ - -qt-mouse-tslib -qt-gfx-transformed -embedded ${QT_ARCH}" - -do_configure() { - # Hack to honor our compiler flags - sed -i s/-O2//g ${S}/mkspecs/*/qmake.conf - sed -i s/-O2//g ${S}/mkspecs/*/*/qmake.conf - - - # Install the OE build templates (something which might be done - # by inheriting qmake) - for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ - do - install -d ${S}/mkspecs/$template - install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf - ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h - done - - # The Qmake Makefile generation doesn't like these environment - # variables, as they mess up the HOST tools builds - unset CC - unset CXX - unset CFLAGS - unset CXXFLAGS - unset LDFLAGS - - # For rationale behind the installation locations, see remark above - echo yes | ./configure -v \ - -prefix ${prefix} \ - -bindir ${bindir} \ - -libdir ${libdir} \ - -docdir ${docdir}/qtopia \ - -headerdir ${includedir} \ - -plugindir ${datadir}/qtopia/plugins \ - -datadir ${datadir} \ - -translationdir ${datadir}/qtopia/translations \ - -sysconfdir ${sysconfdir} \ - -examplesdir ${bindir}/qtopia/examples \ - -demosdir ${bindir}/qtopia/demos \ - -embedded ${QT_ARCH} ${QT_ENDIAN} -fast \ - -xplatform linux-oe-g++ \ - ${QT_CONFIG_FLAGS} \ - -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -} - -# -# Fixup some pkgconfig files -# moc_location=/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/bin/moc -# uic_location=/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/bin/uic -# -# Libs: -L${libdir} -lQtNetwork -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/staging/arm-angstrom-linux/lib -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/lib $(LIBS_EXTRA) -lQtCore -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/staging/arm-angstrom-linux/lib -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/lib -lm -lrt -lpthread -ldl -# -do_compile_append() { - cd ${S}/lib/pkgconfig - sed -i s#"-L${S}/lib"##g *.pc - sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# *.pc - sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# *.pc -} - -do_stage_append() { - echo "Fixing up Qt" - cd ${STAGING_LIBDIR}/pkgconfig - sed -i s#"-L${S}/lib"##g Qt*.pc - sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# Qt*.pc - sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# Qt*.pc -} - -do_install() { - oe_runmake install INSTALL_ROOT=${D} - - # These are host binaries, we should only use them in staging - rm -rf ${D}/${bindir} - rm -rf ${D}/${datadir}/mkspecs - - touch ${D}/${libdir}/fonts/fontdir -} - -# We might want to package all the libraries separately, so you can really -# fine-tune what to install. This is e.g. done in qt4-x11-free_4.1.2.bb. -# What should these packages be called? I'm tempted to call them the same -# as in qt4 version, as the API is supposed to be compatible, e.g. -# libqtcore4 and libqtgui4. This will however conflict if you have QT and -# Qtopia, but this is something you don't want anyway, I guess. -# Another solution is making virtual/libqtfoo4, and DEPENDing on that one -# and let both the PACKAGES in QT and Qtopia PROVIDE these. The packages -# themselves could then be called libqtopiafoo4. -# I'll postpone this discussion by not making separate Qtopia packages. - -# Also, I don't package the plugins and translations atm, I don't use them -# and I don't feel like thinking about a sensible separation. - -PACKAGES =+ " libqtcore libqtcore-dev libqtcore-dbg \ - libqtxml libqtxml-dev libqtxml-dbg \ - libqtgui libqtgui-dev libqtgui-dbg \ - libqtsql libqtsql-dev libqtsql-dbg \ - libqtnetwork libqtnetwork-dev libqtnetwork-dbg \ - libqtsvg libqtsvg-dev libqtsvg-dbg \ - libqt3support libqt3support-dev libqt3support-dbg \ - qtopia-core-plugins qtopia-core-plugins-dbg \ - libqtscript libqtscript-dev libqtscript-dbg \ - " - -PACKAGES += " ${PN}-fonts " - -# The default included fonts are around 75MB and consist of a number of -# FreeType-renderable fonts as well as QPF (Qtopia Prerendered Fonts). -# As FreeType is generally slow on embedded platforms, and 75MB is -# quite huge, we downsize the fonts dir in the do_install. I've decided -# to include only the QPF (Helvetica and Fixed), amounting to 500KB. This -# also results in tremendously faster application startup time. -FILES_libqtcore += " ${libdir}/fonts/helvetic* ${libdir}/fonts/fixed* ${D}/${libdir}/fonts/fontdir" -FILES_${PN}-fonts = "${libdir}/fonts" - -FILES_qtopia-core-plugins += "${datadir}/qtopia/plugins/*/*.so" -FILES_qtopia-core-plugins-dbg += "${datadir}/qtopia/plugins/*/.debug/*.so" - -FILES_libqtcore += "${libdir}/libQtCore.so.*" -FILES_libqtxml += "${libdir}/libQtXml.so.*" -FILES_libqtgui += "${libdir}/libQtGui.so.*" -FILES_libqtsql += "${libdir}/libQtSql.so.*" -FILES_libqtnetwork += "${libdir}/libQtNetwork.so.*" -FILES_libqtsvg += "${libdir}/libQtSvg.so.*" -FILES_libqt3support += "${libdir}/libQt3Support.so.*" -FILES_libqtscript += "${libdir}/libQtScript.so.*" - -FILES_libqtcore-dev += "${libdir}/*QtCore.*" -FILES_libqtxml-dev += "${libdir}/*QtXml.*" -FILES_libqtgui-dev += "${libdir}/*QtGui.*" -FILES_libqtsql-dev += "${libdir}/*QtSql.*" -FILES_libqtnetwork-dev += "${libdir}/*QtNetwork.*" -FILES_libqtsvg-dev += "${libdir}/*QtSvg.*" -FILES_libqt3support-dev += "${libdir}/*Qt3Support.*" -FILES_libqtscript-dev += "${libdir}/*QtScript.*" - -FILES_libqtcore-dbg += "${libdir}/.debug/libQtCore*" -FILES_libqtxml-dbg += "${libdir}/.debug/libQtXml*" -FILES_libqtgui-dbg += "${libdir}/.debug/libQtGui*" -FILES_libqtsql-dbg += "${libdir}/.debug/libQtSql*" -FILES_libqtnetwork-dbg += "${libdir}/.debug/libQtNetwork*" -FILES_libqtsvg-dbg += "${libdir}/.debug/libQtSvg*" -FILES_libqt3support-dbg += "${libdir}/.debug/libQt3Support*" -FILES_libqtscript-dbg += "${libdir}/.debug/libQtScript*" - - -python populate_packages_prepend() { - translationdir = bb.data.expand('${datadir}/qtopia/translations/', d) - do_split_packages(d, translationdir, '^qt_(.*)\.qm$', 'qtopia-translation-%s', 'Qtopia translation for %s', extra_depends='' ) -} - - - -STAGE_TEMP = "${WORKDIR}/temp-staging" -do_stage() { - rm -rf ${STAGE_TEMP} - mkdir -p ${STAGE_TEMP} - oe_runmake install INSTALL_ROOT=${STAGE_TEMP} - - install -d ${STAGING_INCDIR}/qtopiacore4 - install -d ${STAGING_LIBDIR}/qtopiacore4 - cp -af ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR}/qtopiacore4/ - - for i in ${STAGE_TEMP}/${libdir}/*.la - do - oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la) ${STAGING_LIBDIR}/qtopiacore4 - done - - rm -rf ${STAGE_TEMP} -} - diff --git a/packages/uicmoc/uicmoc4-native.inc b/packages/uicmoc/uicmoc4-native.inc index 8f0c715a89..298c103fb1 100644 --- a/packages/uicmoc/uicmoc4-native.inc +++ b/packages/uicmoc/uicmoc4-native.inc @@ -27,8 +27,8 @@ EXTRA_OECONF = "-prefix ${STAGING_DIR_NATIVE}/qt4 \ EXTRA_OEMAKE = " " do_configure() { - sed -i 's:^QT += xml qt3support$:QT += xml qt3support network:' "${S}"/src/tools/uic3/uic3.pro - echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" + sed -i 's:^QT += xml qt3support$:QT += xml qt3support network:' "${S}"/src/tools/uic3/uic3.pro + echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" } TOBUILD = "\ @@ -45,17 +45,18 @@ TOBUILD = "\ " do_compile() { - unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS - for i in ${TOBUILD}; do - cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}" - done + unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS + for i in ${TOBUILD}; + do + cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}" + done } do_stage() { - install -m 0755 bin/moc ${STAGING_BINDIR}/moc4 - install -m 0755 bin/uic ${STAGING_BINDIR}/uic4 - install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34 - install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4 - install -d ${STAGING_DIR_NATIVE}/qt4/ - install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR_NATIVE}/qt4/ + install -m 0755 bin/moc ${STAGING_BINDIR}/moc4 + install -m 0755 bin/uic ${STAGING_BINDIR}/uic4 + install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34 + install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4 + install -d ${STAGING_DIR_NATIVE}/qt4/ + install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR_NATIVE}/qt4/ } diff --git a/packages/uicmoc/uicmoc4-native_4.3.2.bb b/packages/uicmoc/uicmoc4-native_4.3.3.bb index 1950f63068..1950f63068 100644 --- a/packages/uicmoc/uicmoc4-native_4.3.2.bb +++ b/packages/uicmoc/uicmoc4-native_4.3.3.bb |