summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/files/compile.test-lflags.patch13
-rw-r--r--meta/recipes-qt/qt4/files/configure-lflags.patch13
-rw-r--r--meta/recipes-qt/qt4/files/configure-paths.patch21
-rw-r--r--meta/recipes-qt/qt4/files/qmake-exists-check.patch18
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-nativesdk.inc111
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb6
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.1.bb6
7 files changed, 188 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/files/compile.test-lflags.patch b/meta/recipes-qt/qt4/files/compile.test-lflags.patch
new file mode 100644
index 0000000000..e4b256b0ce
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/compile.test-lflags.patch
@@ -0,0 +1,13 @@
1Index: qt-everywhere-opensource-src-4.6.3/config.tests/unix/compile.test
2===================================================================
3--- qt-everywhere-opensource-src-4.6.3.orig/config.tests/unix/compile.test 2010-06-02 06:03:18.000000000 +0400
4+++ qt-everywhere-opensource-src-4.6.3/config.tests/unix/compile.test 2010-10-04 17:35:07.587783460 +0400
5@@ -11,7 +11,7 @@
6 EXE=`basename "$6"`
7 DESCRIPTION=$7
8 shift 7
9-LFLAGS=""
10+LFLAGS="$LDFLAGS"
11 INCLUDEPATH=""
12 CXXFLAGS=""
13 MAC_ARCH_CXXFLAGS=""
diff --git a/meta/recipes-qt/qt4/files/configure-lflags.patch b/meta/recipes-qt/qt4/files/configure-lflags.patch
new file mode 100644
index 0000000000..df195494ee
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/configure-lflags.patch
@@ -0,0 +1,13 @@
1Index: qtopia-core-opensource-src-4.3.3/configure
2===================================================================
3--- qtopia-core-opensource-src-4.3.3.orig/configure 2008-01-14 08:53:51.000000000 +0000
4+++ qtopia-core-opensource-src-4.3.3/configure 2008-01-14 08:54:07.000000000 +0000
5@@ -447,7 +447,7 @@
6 # initalize variables
7 #-------------------------------------------------------------------------------
8
9-SYSTEM_VARIABLES="CC CXX CFLAGS CXXFLAGS LDFLAGS"
10+SYSTEM_VARIABLES="CC CXX CFLAGS CXXFLAGS LDFLAGS LFLAGS"
11 for varname in $SYSTEM_VARIABLES; do
12 cmd=`echo \
13 'if [ -n "\$'${varname}'" ]; then
diff --git a/meta/recipes-qt/qt4/files/configure-paths.patch b/meta/recipes-qt/qt4/files/configure-paths.patch
new file mode 100644
index 0000000000..c9259a1159
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/configure-paths.patch
@@ -0,0 +1,21 @@
1Index: qt-everywhere-opensource-src-4.6.3/configure
2===================================================================
3--- qt-everywhere-opensource-src-4.6.3.orig/configure 2011-01-10 15:47:37.100607001 +0000
4+++ qt-everywhere-opensource-src-4.6.3/configure 2011-01-10 15:49:14.576606999 +0000
5@@ -7198,11 +7198,11 @@
6 QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc
7
8 #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
9-QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc
10-QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic
11-QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3
12-QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc
13-QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
14+QMAKE_MOC = \${OE_QMAKE_MOC}
15+QMAKE_UIC = \${OE_QMAKE_UIC}
16+QMAKE_UIC3 = \${OE_QMAKE_UIC3}
17+QMAKE_RCC = \${OE_QMAKE_RCC}
18+QMAKE_QDBUSXML2CPP = \${OE_QMAKE_QDBUSXML2CPP}
19 QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include
20 QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib
21
diff --git a/meta/recipes-qt/qt4/files/qmake-exists-check.patch b/meta/recipes-qt/qt4/files/qmake-exists-check.patch
new file mode 100644
index 0000000000..cc73837e53
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/qmake-exists-check.patch
@@ -0,0 +1,18 @@
1qt4-tools-nativesdk: avoid rebuilding qmake
2
3qt4-tools-nativesdk patch to avoids building qmake in configure if it already exists
4(as it will, since we symlink it in from the native sysroot in do_configure)
5
6Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
7
8--- qt-everywhere-opensource-src-4.6.3.orig/configure 2011-01-10 12:01:56.260607001 +0000
9+++ qt-everywhere-opensource-src-4.6.3/configure 2011-01-10 12:02:20.584607015 +0000
10@@ -4286,7 +4286,7 @@
11 }
12
13 # build qmake
14-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
15+if [ '!' -f "$outpath/bin/qmake" ]; then
16 echo "Creating qmake. Please wait..."
17
18 OLD_QCONFIG_H=
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
new file mode 100644
index 0000000000..f273c9fab8
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
@@ -0,0 +1,111 @@
1DESCRIPTION = "SDK tools for Qt/[X11|Mac|Embedded] version 4.x"
2DEPENDS = "zlib-nativesdk dbus-nativesdk libx11-nativesdk qt4-tools-native"
3SECTION = "libs"
4HOMEPAGE = "http://qt.nokia.com"
5PRIORITY = "optional"
6LICENSE = "LGPLv2.1 | GPLv3"
7
8INC_PR = "r3"
9
10FILESPATHPKG =. "qt-${PV}:"
11inherit nativesdk qmake2
12
13SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
14 file://configure-lflags.patch \
15 file://compile.test-lflags.patch \
16 file://qt-config.patch \
17 file://qmake-exists-check.patch \
18 file://configure-paths.patch \
19 file://g++.conf \
20 file://linux.conf"
21
22S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
23
24LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
25 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
26 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
27
28# FIXME: make it work with "${STAGING_BINDIR_NATIVE}/pkg-config --cflags dbus-1"
29EXTRA_OECONF = "-prefix ${prefix} \
30 -qt-libjpeg -qt-gif -system-zlib \
31 -no-libjpeg -no-libpng -no-libmng -no-libtiff \
32 -no-accessibility \
33 -no-cups \
34 -no-exceptions \
35 -no-nas-sound \
36 -no-nis -no-openssl \
37 -verbose -release -fast -static \
38 -platform ${TARGET_OS}-oe-g++ \
39 -xplatform ${TARGET_OS}-oe-g++ \
40 -embedded -no-freetype -no-glib -no-iconv \
41 -qt3support \
42 -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include \
43 -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/freetype2 \
44 -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/dbus-1.0 \
45 -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/lib/dbus-1.0/include \
46 -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/c++ \
47 -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/c++/${TARGET_SYS} \
48 -L${STAGING_DIR_HOST}${SDKPATHNATIVE}/lib \
49 -L${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/lib"
50
51# yank default -e, otherwise we get the following error:
52# moc_qbuffer.cpp: No such file or directory
53EXTRA_OEMAKE = " "
54
55do_configure() {
56 if [ ! -e bin/qmake ]; then
57 ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake
58 fi
59
60 if [ ! -e mkspecs/${TARGET_OS}-oe-g++ ]; then
61 ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++
62 fi
63
64 cp ../g++.conf mkspecs/common
65 cp ../linux.conf mkspecs/common
66
67 (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
68}
69
70TOBUILD = "\
71 src/tools/bootstrap \
72 src/tools/moc \
73 src/corelib \
74 src/sql \
75 src/dbus \
76 src/qt3support \
77 src/xml \
78 src/tools/uic \
79 src/tools/rcc \
80 src/network \
81 src/gui \
82 src/tools/uic3 \
83 tools/linguist/lrelease \
84 tools/linguist/lupdate \
85 tools/qdbus \
86"
87
88do_compile() {
89 for i in ${TOBUILD}; do
90 cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
91 done
92}
93
94do_install() {
95 install -d ${D}${bindir}
96 install -m 0755 bin/qmake ${D}${bindir}/qmake2
97 for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do
98 install -m 0755 bin/${i} ${D}${bindir}/${i}4
99 done
100
101 (cd ${D}${bindir}; \
102 ln -s qmake2 qmake; \
103 for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do \
104 ln -s ${i}4 ${i}; \
105 done)
106
107 # make a symbolic link to mkspecs for compatibility with Nokia's SDK
108 # and QTCreator
109 (cd ${D}${bindir}/..; ln -s ${TARGET_SYS}/usr/share/qtopia/mkspecs mkspecs;)
110}
111
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb
new file mode 100644
index 0000000000..d64542b5fe
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb
@@ -0,0 +1,6 @@
1require qt4-tools-nativesdk.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI[md5sum] = "5c69f16d452b0bb3d44bc3c10556c072"
6SRC_URI[sha256sum] = "f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768"
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.1.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.1.bb
new file mode 100644
index 0000000000..091a539271
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.1.bb
@@ -0,0 +1,6 @@
1require qt4-tools-nativesdk.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI[md5sum] = "6f88d96507c84e9fea5bf3a71ebeb6d7"
6SRC_URI[sha256sum] = "8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-12 02:50:51 +0000