[oe-commits] org.oe.dev merge of 'e523e8071d3fe835cfd277ef7adf62c2822468c2'
oe commit
openembedded-commits at lists.openembedded.org
Wed Dec 26 17:34:39 UTC 2007
merge of 'e523e8071d3fe835cfd277ef7adf62c2822468c2'
and 'fd336c878a7a068ed14755cf0c44b0a8d70747ac'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: a211ba42d2c74bcac9e9a4c50701a9b2505b8f34
ViewMTN: http://monotone.openembedded.org/revision/info/a211ba42d2c74bcac9e9a4c50701a9b2505b8f34
Files:
1
packages/tasks/task-nas-server.bb
packages/qmake/qmake2-native-2.10a
packages/qmake/qmake2-native
packages/qmake/qmake2-native_2.10a.bb
packages/qmake/qmake2-native.inc
packages/qt/qt4-x11-free-4.1.2
packages/qt4/qt4-x11-free-4.1.2
packages/qt/qt4-x11-free-4.3.2
packages/qt4/qt4-x11-free-4.3.3
packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch
packages/qt4/files/0001-cross-compile.patch
packages/qt/qt4-x11-free-4.3.2/0003-no-tools.patch
packages/qt4/files/0003-no-tools.patch
packages/qt/qt4-x11-free-4.3.2/0005-fix-mkspecs.patch
packages/qt4/files/0005-fix-mkspecs.patch
packages/qt/qt4-x11-free_4.1.2.bb
packages/qt4/qt4-x11-free_4.1.2.bb
packages/qt/qt4-x11-free_4.3.2.bb
packages/qt4/qt4-x11-free_4.3.3.bb
packages/qt/qt4_arch.inc
packages/qt4/qt4_arch.inc
packages/qte/qtopia-core
packages/qt4/qtopia-core
packages/qte/qtopia-core_4.2.0.bb
packages/qt4/qtopia-core_4.2.0.bb
packages/qte/qtopia-core_4.3.2.bb
packages/qt4/qtopia-core_4.3.3.bb
packages/uicmoc/uicmoc4-native_4.3.2.bb
packages/uicmoc/uicmoc4-native_4.3.3.bb
packages/qt4
packages/qt4/files
packages/qt4/qtopia-core-4.3.3
packages/qmake/qmake2-native/qt-config.patch
packages/qt4/qt4-x11-free.inc
packages/qt4/qt_configuration.inc
packages/qt4/qt_depends.inc
packages/qt4/qt_packaging.inc
packages/qt4/qt_staging.inc
packages/qt4/qtopia-core/0004-no-qmake.patch
packages/qt4/qtopia-core-4.3.3/0006-freetype-host-includes.patch
packages/qt4/qtopia-core-4.3.3/0007-openssl-host-includes.patch
packages/qt4/qtopia-core.inc
classes/qmake2.bbclass
classes/qtopia4core.bbclass
classes/xilinx-bsp.bbclass
conf/checksums.ini
conf/distro/include/angstrom-2007-preferred-versions.inc
packages/busybox/busybox_1.00.bb
packages/gallery/gallery_1.5.5.bb
packages/glibc/eglibc-package.bbclass
packages/glibc/glibc-package.bbclass
packages/linux/linux-dht-walnut_2.6.20.bb
packages/linux/linux-efika_2.6.20.20.bb
packages/linux/linux-efika_2.6.20.bb
packages/linux/linux-efika_2.6.21+git.bb
packages/linux/linux-magicbox_2.6.18.6.bb
packages/linux/linux-magicbox_2.6.19.2.bb
packages/linux/linux-ml403-mvista-2.6.x_git.bb
packages/linux/linux-ml403-slab-2.6.x_git.bb
packages/linux/linux-sequoia_2.6.21.bb
packages/meta/external-toolchain.bb
packages/openmoko2/openmoko-sample2_svn.bb
packages/qmake/qmake2-native/0001-fix-mkspecs.patch
packages/uicmoc/uicmoc4-native.inc
Diffs:
#
# mt diff -re523e8071d3fe835cfd277ef7adf62c2822468c2 -ra211ba42d2c74bcac9e9a4c50701a9b2505b8f34
#
#
#
# patch "packages/tasks/task-nas-server.bb"
# from [62167ff91124b6983115d92bd330e863aac1d877]
# to [bc3800e5b3259931774d27dc23700b4818a3f6aa]
#
============================================================
--- packages/tasks/task-nas-server.bb 62167ff91124b6983115d92bd330e863aac1d877
+++ packages/tasks/task-nas-server.bb bc3800e5b3259931774d27dc23700b4818a3f6aa
@@ -1,7 +1,7 @@ PROVIDES = "task-nas-server-everything"
DESCRIPTION = "Tasks for a Network Attached Storage server"
LICENSE = "MIT"
PROVIDES = "task-nas-server-everything"
-PR = "r0"
+PR = "r1"
inherit task
@@ -15,6 +15,7 @@ NAS_SERVER_PACKAGES = "\
task-nas-server-samba \
task-nas-server-dnsmasq \
task-nas-server-iptables \
+ task-nas-server-openmoko \
task-nas-server-tzdata \
task-nas-server-nfs \
task-nas-server-vfat \
@@ -55,6 +56,13 @@ RRECOMMENDS_task-nas-server-iptables = "
kernel-module-ipt-masquerade \
"
+DESCRIPTION_task-nas-server-openmoko = "NAS-Server: OpenMoko Support"
+RDEPENDS_task-nas-server-openmoko = "\
+ dfu-util \
+"
+RRECOMMENDS_task-nas-server-openmoko = "\
+"
+
DESCRIPTION_task-nas-server-tzdata = "NAS-Server: Timezone Support"
RDEPENDS_task-nas-server-tzdata = "\
tzdata \
#
# mt diff -rfd336c878a7a068ed14755cf0c44b0a8d70747ac -ra211ba42d2c74bcac9e9a4c50701a9b2505b8f34
#
#
#
# rename "packages/qmake/qmake2-native-2.10a"
# to "packages/qmake/qmake2-native"
#
# rename "packages/qmake/qmake2-native_2.10a.bb"
# to "packages/qmake/qmake2-native.inc"
#
# rename "packages/qt/qt4-x11-free-4.1.2"
# to "packages/qt4/qt4-x11-free-4.1.2"
#
# rename "packages/qt/qt4-x11-free-4.3.2"
# to "packages/qt4/qt4-x11-free-4.3.3"
#
# rename "packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch"
# to "packages/qt4/files/0001-cross-compile.patch"
#
# rename "packages/qt/qt4-x11-free-4.3.2/0003-no-tools.patch"
# to "packages/qt4/files/0003-no-tools.patch"
#
# rename "packages/qt/qt4-x11-free-4.3.2/0005-fix-mkspecs.patch"
# to "packages/qt4/files/0005-fix-mkspecs.patch"
#
# rename "packages/qt/qt4-x11-free_4.1.2.bb"
# to "packages/qt4/qt4-x11-free_4.1.2.bb"
#
# rename "packages/qt/qt4-x11-free_4.3.2.bb"
# to "packages/qt4/qt4-x11-free_4.3.3.bb"
#
# rename "packages/qt/qt4_arch.inc"
# to "packages/qt4/qt4_arch.inc"
#
# rename "packages/qte/qtopia-core"
# to "packages/qt4/qtopia-core"
#
# rename "packages/qte/qtopia-core_4.2.0.bb"
# to "packages/qt4/qtopia-core_4.2.0.bb"
#
# rename "packages/qte/qtopia-core_4.3.2.bb"
# to "packages/qt4/qtopia-core_4.3.3.bb"
#
# rename "packages/uicmoc/uicmoc4-native_4.3.2.bb"
# to "packages/uicmoc/uicmoc4-native_4.3.3.bb"
#
# add_dir "packages/qt4"
#
# add_dir "packages/qt4/files"
#
# add_dir "packages/qt4/qtopia-core-4.3.3"
#
# add_file "packages/qmake/qmake2-native/qt-config.patch"
# content [ffca4aa5d3ae8c6e3e9c1d699382d3079a770c7c]
#
# add_file "packages/qmake/qmake2-native_2.10a.bb"
# content [87d12872c36ccf6797ad38776a929652d95a4850]
#
# add_file "packages/qt4/qt4-x11-free.inc"
# content [4999377acbce5c192356f465789adc625e3135f3]
#
# add_file "packages/qt4/qt_configuration.inc"
# content [5abde732116982782ed3a94ede56bf274012fc1f]
#
# add_file "packages/qt4/qt_depends.inc"
# content [2fd4202201d2ae2c8c52f8b9c4ac142e55516259]
#
# add_file "packages/qt4/qt_packaging.inc"
# content [6c277ec158a91be79bb7e6484f8610fdc85e729c]
#
# add_file "packages/qt4/qt_staging.inc"
# content [426479a75ece31757e047679175820b2fdf3fcfb]
#
# add_file "packages/qt4/qtopia-core/0004-no-qmake.patch"
# content [3161380072937eb18db9e2b0e7ab732d8a1ad0e8]
#
# add_file "packages/qt4/qtopia-core-4.3.3/0006-freetype-host-includes.patch"
# content [3570223a649acdeb59d0a0d14207bea417a9c8b5]
#
# add_file "packages/qt4/qtopia-core-4.3.3/0007-openssl-host-includes.patch"
# content [a1b4e6415d9a946ffd9c11915b871187c76f8245]
#
# add_file "packages/qt4/qtopia-core.inc"
# content [c772ab48d1d0aed43a6f098861d9c762e9dd4f32]
#
# patch "classes/qmake2.bbclass"
# from [4720a6ca5e41a1786e98f6876c83791801e04a1a]
# to [e469f74476f5cd684b559146bbd4e808de9dcadb]
#
# patch "classes/qtopia4core.bbclass"
# from [f05bb12d7e6296c2ea9e9656a44b1c93f5f0cf21]
# to [7dbc3f0dec99238640767e983264960e4a286e1b]
#
# patch "classes/xilinx-bsp.bbclass"
# from [1c5ead4afe4f57431d3f3a5a8c80bdaf34afa9b8]
# to [e8c7ed63687307cb104b234a6c0f4b060974c982]
#
# patch "conf/checksums.ini"
# from [ce22da057e8b56ac8825b7a043b4fa7cc3f86027]
# to [8b808b2bc16a048f0af0417d52948e7da22f97ca]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [d7c8eafeaf5307c4c7714a1560e880c30c9dec32]
# to [782e80b0f3b3076866c7a3507276ad9f24f91bc4]
#
# patch "packages/busybox/busybox_1.00.bb"
# from [a4331e926e10003bf120d6d761b2d94e554c6ab9]
# to [cbf5fd6adad4719d56db281aafea88d874e63772]
#
# patch "packages/gallery/gallery_1.5.5.bb"
# from [08012e9bbaba0586c7721ce8bf77b816de83ebd2]
# to [733e15213ab5e6ec1bd791438af67af63d5ec35c]
#
# patch "packages/glibc/eglibc-package.bbclass"
# from [8f51cdb2c68ef10a8cc444bb9c80b76e1b529a8e]
# to [707f3f7fec8dba48bff09a80fe93f4d753d0ae20]
#
# patch "packages/glibc/glibc-package.bbclass"
# from [87de7a00ded18ae91f844d05b3fb78dd64e0fd7b]
# to [f4791b3fa7f4d093f75d3e760b405eca7feae357]
#
# patch "packages/linux/linux-dht-walnut_2.6.20.bb"
# from [e5816104c0cc5c15e529f5e0d60970d176df3b7c]
# to [032566f5149e9d714c6631ead6e1db18ccb1dc26]
#
# patch "packages/linux/linux-efika_2.6.20.20.bb"
# from [02bf23057848f530f4bb9b387634af8ca51c55f3]
# to [01117a66cc290abe28c789551dafbdaadaf2e6df]
#
# patch "packages/linux/linux-efika_2.6.20.bb"
# from [3d646a13d61ed36e48613a5d62ae4c153c42616e]
# to [26eb3e8b2f654dac6975e04c0e7c078417623da6]
#
# patch "packages/linux/linux-efika_2.6.21+git.bb"
# from [b07652616db0ca693ab942e5d21576b84f04e3e9]
# to [1d96763c1bba903c9753ae5d85530485bea1668d]
#
# patch "packages/linux/linux-magicbox_2.6.18.6.bb"
# from [2863c6191e6edd688014663327d3b35bfd47e9ea]
# to [9929bed5a862613d7d6d47cab1dbbed6605b127d]
#
# patch "packages/linux/linux-magicbox_2.6.19.2.bb"
# from [b03c2ca7543c5914973b54ef5b3ea159fbef77ed]
# to [f40feb36483f15f528a68ff787da7d1a1dc83f38]
#
# patch "packages/linux/linux-ml403-mvista-2.6.x_git.bb"
# from [607a3ec1212c49a8bec07ab6a9220e1868f31e6d]
# to [1627e847f526fa7073747ec037b61f626f96352f]
#
# patch "packages/linux/linux-ml403-slab-2.6.x_git.bb"
# from [9199fb7885a068659ab66b6897c7dcf1f94cf3c4]
# to [5030af659ba81e0fd39cabcfe458111ae1646763]
#
# patch "packages/linux/linux-sequoia_2.6.21.bb"
# from [91ba088cf6b7afc424eda939be7afb1dd6223594]
# to [5dc8ca7fe3e92accabff7e6dc3d9d28540f8839b]
#
# patch "packages/meta/external-toolchain.bb"
# from [32574844f3d4c4554cb6e4193123ab1c001b9046]
# to [dcaf40be62789b278a8bcf32b7d1a80010487c6a]
#
# patch "packages/openmoko2/openmoko-sample2_svn.bb"
# from [8dfb2ad71843cf6a80cb46f17623565dbd5a95fa]
# to [f81b348bfe4ffd0c3a27b9c3042e6e2945ea3971]
#
# patch "packages/qmake/qmake2-native/0001-fix-mkspecs.patch"
# from [922f4e6417cdecfd244c36a59d7ff67bb3e7578c]
# to [d5283fc24b925190ca90f56511934f3fd132ea17]
#
# patch "packages/qmake/qmake2-native.inc"
# from [d941635b01c58764ba76d411ea57f1b33b4d22eb]
# to [d58b0ef825d0f6d7d1a0103da1b2ec0e903de4b2]
#
# patch "packages/qt4/files/0005-fix-mkspecs.patch"
# from [4ac628818045f6790dafb35be445cd3989de25c2]
# to [d5283fc24b925190ca90f56511934f3fd132ea17]
#
# patch "packages/qt4/qt4-x11-free_4.3.3.bb"
# from [b7e59e0489502bdfca8e0b0220da5df284fb0995]
# to [cc8872a380445d2c8344bc46ac50b6ba36513594]
#
# patch "packages/qt4/qt4_arch.inc"
# from [43091f9af06d057e17db4730361caf8d5fc177c6]
# to [66bd102114f50fe3120367af2f65157b737db929]
#
# patch "packages/qt4/qtopia-core_4.2.0.bb"
# from [003bf319b5866af6b727725457754c7f73345f6d]
# to [36b4cc98d0151feaf001a4f9c673771698efee04]
#
# patch "packages/qt4/qtopia-core_4.3.3.bb"
# from [132f2ff144e5483dcf628cf56459ce7b81f52b0f]
# to [79b0ab4f4981a89ecb7eecc8556f7d53c2e6d671]
#
# patch "packages/uicmoc/uicmoc4-native.inc"
# from [00e140a2db2c4a7280faaacf41cf19e10afd1b52]
# to [6886688b3df896b25e7d22c296b444e6c7704bd2]
#
============================================================
--- packages/qmake/qmake2-native/qt-config.patch ffca4aa5d3ae8c6e3e9c1d699382d3079a770c7c
+++ packages/qmake/qmake2-native/qt-config.patch ffca4aa5d3ae8c6e3e9c1d699382d3079a770c7c
@@ -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
============================================================
--- packages/qmake/qmake2-native_2.10a.bb 87d12872c36ccf6797ad38776a929652d95a4850
+++ packages/qmake/qmake2-native_2.10a.bb 87d12872c36ccf6797ad38776a929652d95a4850
@@ -0,0 +1,2 @@
+QTVERSION="4.3.3"
+require ${PN}.inc
============================================================
--- packages/qt4/qt4-x11-free.inc 4999377acbce5c192356f465789adc625e3135f3
+++ packages/qt4/qt4-x11-free.inc 4999377acbce5c192356f465789adc625e3135f3
@@ -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 = "r7"
+
+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
============================================================
--- packages/qt4/qt_configuration.inc 5abde732116982782ed3a94ede56bf274012fc1f
+++ packages/qt4/qt_configuration.inc 5abde732116982782ed3a94ede56bf274012fc1f
@@ -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
+}
============================================================
--- packages/qt4/qt_depends.inc 2fd4202201d2ae2c8c52f8b9c4ac142e55516259
+++ packages/qt4/qt_depends.inc 2fd4202201d2ae2c8c52f8b9c4ac142e55516259
@@ -0,0 +1,3 @@
+inherit pkgconfig qmake_base
+
+DEPENDS += " uicmoc4-native qmake2-native freetype jpeg libpng zlib dbus openssl glib-2.0"
============================================================
--- packages/qt4/qt_packaging.inc 6c277ec158a91be79bb7e6484f8610fdc85e729c
+++ packages/qt4/qt_packaging.inc 6c277ec158a91be79bb7e6484f8610fdc85e729c
@@ -0,0 +1,153 @@
+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 \%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list