summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-01-03 13:41:33 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-04 12:08:31 +0000
commit670706d1d3e3b16636818584fec0441f70b793d9 (patch)
treec732b65f9e5049fb5694cdbe648f08f262f5e911
parent99a6e1a3a453c17575439723599da6bef62175bb (diff)
downloadpoky-670706d1d3e3b16636818584fec0441f70b793d9.tar.gz
qt4: add version 4.8.0
Version 4.8.0 makes a few minor changes in the internal build system - the following issues had to be worked around: * The -qt-gif configure option has been removed. This is actually the default and has been for some time, so remove it from qt4.inc. * The mkspecs have been refactored requiring us to copy our g++.conf file over the top of g++-unix.conf instead. Some modifications to this file were also necessary to remove some settings that are now in other conf files (and we don't modify those values in any case). * The LD environment variable needs to be unset during configure, or else the configure script overrides our value of QMAKE_LINK which selects ${CXX} as our linker. * QMAKE_CXX contains a reference to OE_QMAKE_CXX which the configure script does not expect and cannot expand and this results in webkit being disabled, so add a workaround for this. (From OE-Core rev: 6b2a5d15ad20573502142b635e6cab9bcfb3b40a) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.0.inc61
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.0/0001-Added-Openembedded-crossarch-option.patch47
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.0/fix-translations.patch32
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.0/g++.conf56
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.0/hack-out-pg2-4.7.0.patch31
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.0/linux.conf66
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.0/qmake_cxx_eval.patch20
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb13
-rw-r--r--meta/recipes-qt/qt4/qt4-native.inc13
-rw-r--r--meta/recipes-qt/qt4/qt4-native_4.8.0.bb14
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-nativesdk.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.0.bb8
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free_4.8.0.bb13
-rw-r--r--meta/recipes-qt/qt4/qt4.inc12
14 files changed, 382 insertions, 6 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.8.0.inc b/meta/recipes-qt/qt4/qt-4.8.0.inc
new file mode 100644
index 0000000000..2addbb211f
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.8.0.inc
@@ -0,0 +1,61 @@
1LICENSE = "LGPLv2.1 | GPLv3"
2LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
3 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
4 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
5
6FILESPATH =. "${FILE_DIRNAME}/qt-${PV}:"
7
8SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
9 file://0004-no-qmake.patch \
10 file://hack-out-pg2-4.7.0.patch \
11 file://0006-freetype-host-includes.patch \
12 file://0009-support-2bpp.patch \
13 file://0001-Added-Openembedded-crossarch-option.patch \
14 file://fix-translations.patch \
15 file://add_nostrip_for_debug_packages.diff \
16 file://qmake_cxx_eval.patch \
17 file://g++.conf \
18 file://linux.conf \
19 "
20
21SRC_URI[md5sum] = "e8a5fdbeba2927c948d9f477a6abe904"
22SRC_URI[sha256sum] = "9392b74e485e15f75a3e07a527547d4f6747eaf55ebce71ba0e863a9fd320b6e"
23
24S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
25
26FILES_${QT_BASE_NAME}-tools_append = " ${bindir}/qml ${bindir}/qmlplugindump"
27FILES_${QT_BASE_NAME}-tools-dbg_append = " ${bindir}/.debug/qml ${bindir}/.debug/qmlplugindump"
28
29PACKAGES_append = " ${QT_BASE_NAME}-tests-dbg ${QT_BASE_NAME}-tests"
30FILES_${QT_BASE_NAME}-tests-dbg = "/usr/tests/qt4/*/.debug"
31FILES_${QT_BASE_NAME}-tests = "/usr/tests/qt4/*"
32
33do_configure_prepend() {
34 for pro in $(find ${S} -name "*.pro") ; do
35 sed -i \
36 -e 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' \
37 -e 's:qtPrepareTool(LRELEASE, lrelease):LRELEASE = ${OE_QMAKE_LRELEASE}:g' $pro
38 done
39
40 sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf
41 sed -i \
42 -e /QMAKE_MOC\ /d \
43 -e /QMAKE_UIC\ /d \
44 -e /QMAKE_UIC3\ /d \
45 -e /QMAKE_RCC\ /d \
46 ${S}/configure
47
48 # Avoid problems with Qt 4.8.0 configure setting QMAKE_LINK from LD (since we want the linker to be g++)
49 unset LD
50}
51
52do_compile() {
53 # Fixup missing wsegl header in some SGX SDKs
54 if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then
55 cp src/3rdparty/powervr/wsegl.h src/plugins/gfxdrivers/powervr/QWSWSEGL/
56 fi
57
58 unset CFLAGS CXXFLAGS
59
60 oe_runmake ${EXTRA_ENV}
61}
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/0001-Added-Openembedded-crossarch-option.patch b/meta/recipes-qt/qt4/qt-4.8.0/0001-Added-Openembedded-crossarch-option.patch
new file mode 100644
index 0000000000..f302c5bd61
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.8.0/0001-Added-Openembedded-crossarch-option.patch
@@ -0,0 +1,47 @@
1From b1ba119f6a824dc01bd42ee00dba4a1653867b72 Mon Sep 17 00:00:00 2001
2From: Matthias Günther <matgnt@gmail.com>
3Date: Wed, 12 May 2010 16:52:45 +0200
4Subject: [PATCH 1/9] Added Openembedded "-crossarch" option
5
6Original Author: Michael Lauer <mickey@vanille-media.de>
7Upstream-Status: Pending
8
9---
10 configure | 7 ++++++-
11 1 files changed, 6 insertions(+), 1 deletions(-)
12
13diff --git a/configure b/configure
14index facd192..9d15136 100755
15--- a/configure
16+++ b/configure
17@@ -954,7 +954,7 @@ while [ "$#" -gt 0 ]; do
18 shift
19 VAL=$1
20 ;;
21- -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config)
22+ -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-crossarch)
23 VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
24 shift
25 VAL="$1"
26@@ -1443,6 +1443,9 @@ while [ "$#" -gt 0 ]; do
27 xplatform)
28 XPLATFORM="$VAL"
29 ;;
30+ crossarch)
31+ CROSSARCH="$VAL"
32+ ;;
33 debug-and-release)
34 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
35 CFG_DEBUG_RELEASE="$VAL"
36@@ -2918,6 +2921,8 @@ elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then
37 CFG_ARCH=$CFG_HOST_ARCH
38 fi
39
40+CFG_ARCH="$CROSSARCH"
41+
42 if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then
43 if [ "$OPT_VERBOSE" = "yes" ]; then
44 echo " '$CFG_ARCH' is supported"
45--
461.7.0.4
47
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/fix-translations.patch b/meta/recipes-qt/qt4/qt-4.8.0/fix-translations.patch
new file mode 100644
index 0000000000..906d4e312f
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.8.0/fix-translations.patch
@@ -0,0 +1,32 @@
1fix phony translation linking error
2
3 | .../usr/lib/crt1.o: In function `_start':
4 | .../../sysdeps/i386/elf/start.S:115: undefined reference to `main'
5 | collect2: ld returned 1 exit status
6
7Upstream-Status: Pending
8
9Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
10
11diff --git a/translations/translations.pro b/translations/translations.pro
12index cdaf04a..24fa668 100644
13--- a/translations/translations.pro
14+++ b/translations/translations.pro
15@@ -20,7 +20,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN}
16 updateqm.CONFIG += no_link
17 QMAKE_EXTRA_COMPILERS += updateqm
18
19-isEmpty(vcproj) {
20+!isEmpty(vcproj) {
21 QMAKE_LINK = @: IGNORE THIS LINE
22 OBJECTS_DIR =
23 win32:CONFIG -= embed_manifest_exe
24@@ -30,7 +30,7 @@ isEmpty(vcproj) {
25 phony_src.input = PHONY_DEPS
26 phony_src.output = phony.c
27 phony_src.variable_out = GENERATED_SOURCES
28- phony_src.commands = echo int main() { return 0; } > phony.c
29+ phony_src.commands = echo \"int main() { return 0; }\" > phony.c
30 phony_src.name = CREATE phony.c
31 phony_src.CONFIG += combine
32 QMAKE_EXTRA_COMPILERS += phony_src
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/g++.conf b/meta/recipes-qt/qt4/qt-4.8.0/g++.conf
new file mode 100644
index 0000000000..e58fb15718
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.8.0/g++.conf
@@ -0,0 +1,56 @@
1#
2# qmake configuration for common gcc
3#
4
5QMAKE_CC = $(OE_QMAKE_CC)
6QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS)
7QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS)
8QMAKE_CFLAGS_DEPS += -M
9QMAKE_CFLAGS_WARN_ON += -Wall -W
10QMAKE_CFLAGS_WARN_OFF += -w
11QMAKE_CFLAGS_RELEASE +=
12QMAKE_CFLAGS_DEBUG += -g
13QMAKE_CFLAGS_SHLIB += -fPIC
14QMAKE_CFLAGS_STATIC_LIB += -fPIC
15QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses
16QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
17QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
18QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
19
20QMAKE_CXX = $(OE_QMAKE_CXX)
21QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
22QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
23QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
24QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
25QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
26QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
27QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG
28QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB
29QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
30QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC
31QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
32QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
33QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
34
35QMAKE_LINK = $(OE_QMAKE_LINK)
36QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
37QMAKE_LINK_C = $(OE_QMAKE_LINK)
38QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK)
39QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
40QMAKE_LFLAGS_RELEASE +=
41QMAKE_LFLAGS_DEBUG +=
42QMAKE_LFLAGS_APP +=
43QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
44QMAKE_LFLAGS_RPATH = -Wl,-rpath-link,
45
46QMAKE_PCH_OUTPUT_EXT = .gch
47
48# -Bsymbolic-functions (ld) support
49QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
50QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
51
52# some linking helper...
53CONFIG += rpath_libdirs
54
55# for the SDK
56isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt-4.8.0/hack-out-pg2-4.7.0.patch
new file mode 100644
index 0000000000..39c5f4a32c
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.8.0/hack-out-pg2-4.7.0.patch
@@ -0,0 +1,31 @@
1Hack to not use the pg_config of the host system which will add /usr/include
2
3pg_config is a native binary so using that when cross compiling
4will always fail. The commented out fix would do, but for OE
5our -platform and -xplatform is the same so we are actually not
6really cross compiling. Just comment out the test, we are passing
7the location to the postgres headers and if they are okay we
8will pad.
9
10Original Author: Holger Hans Peter Freyther <zecke@selfish.org>
11Upstream-Status: Inappropriate [configuration]
12
13Index: qt-everywhere-opensource-src-4.7.0/configure
14===================================================================
15--- qt-everywhere-opensource-src-4.7.0.orig/configure 2010-09-22 15:43:51.191162141 -0400
16+++ qt-everywhere-opensource-src-4.7.0/configure 2010-09-22 15:44:35.179981232 -0400
17@@ -4921,10 +4921,10 @@
18 psql)
19 if [ "$CFG_SQL_psql" != "no" ]; then
20 # Be careful not to use native pg_config when cross building.
21- if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
22- QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
23- QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
24- fi
25+# if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
26+# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
27+# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
28+# fi
29 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
30 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
31 # But, respect PSQL_LIBS if set
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/linux.conf b/meta/recipes-qt/qt4/qt-4.8.0/linux.conf
new file mode 100644
index 0000000000..a54135513b
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.8.0/linux.conf
@@ -0,0 +1,66 @@
1#
2# qmake configuration for common linux
3#
4
5QMAKE_CFLAGS_THREAD += -D_REENTRANT
6QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD
7
8QMAKE_INCDIR =
9QMAKE_LIBDIR =
10QMAKE_INCDIR_X11 =
11QMAKE_LIBDIR_X11 =
12QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT)
13QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT)
14QMAKE_INCDIR_OPENGL =
15QMAKE_LIBDIR_OPENGL =
16QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
17QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
18QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
19QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
20QMAKE_INCDIR_EGL =
21QMAKE_LIBDIR_EGL =
22QMAKE_INCDIR_OPENVG =
23QMAKE_LIBDIR_OPENVG =
24
25
26QMAKE_LIBS =
27QMAKE_LIBS_DYNLOAD = -ldl
28QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11)
29QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
30QMAKE_LIBS_NIS = -lnsl
31QMAKE_LIBS_EGL = -lEGL
32QMAKE_LIBS_OPENGL = -lGLU -lGL
33QMAKE_LIBS_OPENGL_QT = -lGL
34QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM
35QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
36QMAKE_LIBS_OPENVG = -lOpenVG
37QMAKE_LIBS_THREAD = -lpthread
38
39QMAKE_MOC = $(OE_QMAKE_MOC)
40QMAKE_UIC = $(OE_QMAKE_UIC)
41QMAKE_UIC3 = $(OE_QMAKE_UIC3)
42QMAKE_RCC = $(OE_QMAKE_RCC)
43QMAKE_QDBUSCPP2XML = $(OE_QMAKE_QDBUSCPP2XML)
44QMAKE_QDBUSXML2CPP = $(OE_QMAKE_QDBUSXML2CPP)
45
46QMAKE_AR = $(OE_QMAKE_AR) cqs
47QMAKE_OBJCOPY = objcopy
48QMAKE_RANLIB =
49
50QMAKE_TAR = tar -cf
51QMAKE_GZIP = gzip -9f
52
53QMAKE_COPY = cp -f
54QMAKE_COPY_FILE = $(COPY)
55QMAKE_COPY_DIR = $(COPY) -r
56QMAKE_MOVE = mv -f
57QMAKE_DEL_FILE = rm -f
58QMAKE_DEL_DIR = rmdir
59QMAKE_STRIP = $(OE_QMAKE_STRIP)
60QMAKE_STRIPFLAGS_LIB += --strip-unneeded
61QMAKE_CHK_DIR_EXISTS = test -d
62QMAKE_MKDIR = mkdir -p
63QMAKE_INSTALL_FILE = install -m 644 -p
64QMAKE_INSTALL_PROGRAM = install -m 755 -p
65
66include(unix.conf)
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/qmake_cxx_eval.patch b/meta/recipes-qt/qt4/qt-4.8.0/qmake_cxx_eval.patch
new file mode 100644
index 0000000000..a82f0ff9d1
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.8.0/qmake_cxx_eval.patch
@@ -0,0 +1,20 @@
1Allow expansion of $(...) references in QMAKE_CXX (currently its value
2is $(OE_QMAKE_CXX)) in order to allow compiler version check to succeed
3which allows WebKit to be enabled.
4
5Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
6
7Index: qt-everywhere-opensource-src-4.8.0/configure
8===================================================================
9--- qt-everywhere-opensource-src-4.8.0.orig/configure
10+++ qt-everywhere-opensource-src-4.8.0/configure
11@@ -3322,7 +3322,8 @@ else
12 CFG_FRAMEWORK=no
13 fi
14
15-QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | tail -1`
16+QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg' | tail -1`
17+QMAKE_CONF_COMPILER=`eval "echo $QMAKE_CONF_COMPILER"`
18 TEST_COMPILER="$CXX"
19
20 [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb b/meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb
new file mode 100644
index 0000000000..5c1c97eeac
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb
@@ -0,0 +1,13 @@
1require qt-${PV}.inc
2require qt4-embedded.inc
3
4PR = "${INC_PR}.0"
5
6DEFAULT_PREFERENCE = "-1"
7
8QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
9
10QT_CONFIG_FLAGS += " \
11 -exceptions \
12"
13
diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc
index 8a6eb4b69b..86f2440375 100644
--- a/meta/recipes-qt/qt4/qt4-native.inc
+++ b/meta/recipes-qt/qt4/qt4-native.inc
@@ -22,7 +22,7 @@ S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
22EXTRA_OECONF = "-prefix ${prefix} \ 22EXTRA_OECONF = "-prefix ${prefix} \
23 -L ${STAGING_LIBDIR_NATIVE} \ 23 -L ${STAGING_LIBDIR_NATIVE} \
24 -I ${STAGING_INCDIR_NATIVE} \ 24 -I ${STAGING_INCDIR_NATIVE} \
25 -qt-libjpeg -qt-gif -system-zlib \ 25 -qt-libjpeg -system-zlib \
26 -no-libjpeg -no-libpng -no-libmng -no-libtiff \ 26 -no-libjpeg -no-libpng -no-libmng -no-libtiff \
27 -no-accessibility \ 27 -no-accessibility \
28 -no-cups \ 28 -no-cups \
@@ -39,6 +39,9 @@ EXTRA_OECONF = "-prefix ${prefix} \
39EXTRA_OEMAKE = " " 39EXTRA_OEMAKE = " "
40 40
41do_configure() { 41do_configure() {
42 # Avoid problems with Qt 4.8.0 configure setting QMAKE_LINK from LD (since we want the linker to be g++)
43 unset LD
44
42 (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" 45 (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
43} 46}
44 47
@@ -78,7 +81,13 @@ do_install() {
78 install -d ${D}${datadir}/qt4/ 81 install -d ${D}${datadir}/qt4/
79 cp -PfR mkspecs ${D}${datadir}/qt4/ 82 cp -PfR mkspecs ${D}${datadir}/qt4/
80 ln -sf linux-g++ ${D}${datadir}/qt4/mkspecs/${BUILD_OS}-oe-g++ 83 ln -sf linux-g++ ${D}${datadir}/qt4/mkspecs/${BUILD_OS}-oe-g++
81 cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf ${D}${datadir}/qt4/mkspecs/common/ 84 if [ -f ${D}${datadir}/qt4/mkspecs/common/g++-unix.conf ] ; then
85 # mkspecs were refactored for 4.8.0
86 cp -f ${WORKDIR}/g++.conf ${D}${datadir}/qt4/mkspecs/common/g++-unix.conf
87 else
88 cp -f ${WORKDIR}/g++.conf ${D}${datadir}/qt4/mkspecs/common/g++.conf
89 fi
90 cp -f ${WORKDIR}/linux.conf ${D}${datadir}/qt4/mkspecs/common/
82 91
83 install -m 0644 tools/porting/src/q3porting.xml ${D}${datadir}/qt4/ 92 install -m 0644 tools/porting/src/q3porting.xml ${D}${datadir}/qt4/
84 93
diff --git a/meta/recipes-qt/qt4/qt4-native_4.8.0.bb b/meta/recipes-qt/qt4/qt4-native_4.8.0.bb
new file mode 100644
index 0000000000..86c05007a4
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-native_4.8.0.bb
@@ -0,0 +1,14 @@
1require qt4-native.inc
2
3PR = "${INC_PR}.0"
4
5DEFAULT_PREFERENCE = "-1"
6
7# Find the g++.conf/linux.conf in the right directory.
8FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
9
10TOBUILD := "src/tools/bootstrap ${TOBUILD}"
11
12SRC_URI[md5sum] = "e8a5fdbeba2927c948d9f477a6abe904"
13SRC_URI[sha256sum] = "9392b74e485e15f75a3e07a527547d4f6747eaf55ebce71ba0e863a9fd320b6e"
14
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
index a71c3ae7b0..275fdcc68c 100644
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
@@ -30,7 +30,7 @@ require qt4_arch.inc
30 30
31# FIXME: make it work with "${STAGING_BINDIR_NATIVE}/pkg-config --cflags dbus-1" 31# FIXME: make it work with "${STAGING_BINDIR_NATIVE}/pkg-config --cflags dbus-1"
32EXTRA_OECONF = "-prefix ${prefix} \ 32EXTRA_OECONF = "-prefix ${prefix} \
33 -qt-libjpeg -qt-gif -system-zlib \ 33 -qt-libjpeg -system-zlib \
34 -no-libjpeg -no-libpng -no-libmng -no-libtiff \ 34 -no-libjpeg -no-libpng -no-libmng -no-libtiff \
35 -no-accessibility \ 35 -no-accessibility \
36 -no-cups \ 36 -no-cups \
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.0.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.0.bb
new file mode 100644
index 0000000000..e615d364f0
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.0.bb
@@ -0,0 +1,8 @@
1require qt4-tools-nativesdk.inc
2
3PR = "${INC_PR}.0"
4
5DEFAULT_PREFERENCE = "-1"
6
7SRC_URI[md5sum] = "e8a5fdbeba2927c948d9f477a6abe904"
8SRC_URI[sha256sum] = "9392b74e485e15f75a3e07a527547d4f6747eaf55ebce71ba0e863a9fd320b6e"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.8.0.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.8.0.bb
new file mode 100644
index 0000000000..edd3e0ebed
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.8.0.bb
@@ -0,0 +1,13 @@
1require qt4-x11-free.inc
2require qt-${PV}.inc
3
4PR = "${INC_PR}.0"
5
6DEFAULT_PREFERENCE = "-1"
7
8QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
9
10QT_CONFIG_FLAGS += " \
11 -no-embedded \
12 -xrandr \
13 -x11"
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 87a12e6607..ea868ff23c 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -15,7 +15,7 @@ QT_GLFLAGS ?= ""
15 15
16QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \ 16QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
17 -shared -no-nas-sound -no-nis \ 17 -shared -no-nas-sound -no-nis \
18 -qt-gif -system-libjpeg -system-libpng -system-zlib \ 18 -system-libjpeg -system-libpng -system-zlib \
19 -no-pch -qdbus -stl -glib -phonon -webkit \ 19 -no-pch -qdbus -stl -glib -phonon -webkit \
20 -xmlpatterns -no-rpath -qt3support -silent \ 20 -xmlpatterns -no-rpath -qt3support -silent \
21 ${QT_SQL_DRIVER_FLAGS} \ 21 ${QT_SQL_DRIVER_FLAGS} \
@@ -160,7 +160,7 @@ FILES_${QT_BASE_NAME}-fonts-ttf-vera = "${libdir}/fonts/Vera*.ttf"
160FILES_${QT_BASE_NAME}-fonts-ttf-dejavu = "${libdir}/fonts/DejaVu*.ttf" 160FILES_${QT_BASE_NAME}-fonts-ttf-dejavu = "${libdir}/fonts/DejaVu*.ttf"
161FILES_${QT_BASE_NAME}-fonts-pfa = "${libdir}/fonts/*.pfa" 161FILES_${QT_BASE_NAME}-fonts-pfa = "${libdir}/fonts/*.pfa"
162FILES_${QT_BASE_NAME}-fonts-pfb = "${libdir}/fonts/*.pfb" 162FILES_${QT_BASE_NAME}-fonts-pfb = "${libdir}/fonts/*.pfb"
163FILES_${QT_BASE_NAME}-fonts-qpf = "${libdir}/fonts/*.qpf" 163FILES_${QT_BASE_NAME}-fonts-qpf = "${libdir}/fonts/*.qpf*"
164FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts/README ${libdir}/fonts/fontdir" 164FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts/README ${libdir}/fonts/fontdir"
165FILES_${QT_BASE_NAME}-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/lconvert ${bindir}/qm2ts" 165FILES_${QT_BASE_NAME}-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/lconvert ${bindir}/qm2ts"
166FILES_${QT_BASE_NAME}-linguist-dbg = "${bindir}/.debug/*linguist* ${bindir}/.debug/lrelease ${bindir}/.debug/lupdate ${bindir}/.debug/lconvert ${bindir}/.debug/qm2ts" 166FILES_${QT_BASE_NAME}-linguist-dbg = "${bindir}/.debug/*linguist* ${bindir}/.debug/lrelease ${bindir}/.debug/lupdate ${bindir}/.debug/lconvert ${bindir}/.debug/qm2ts"
@@ -190,7 +190,13 @@ do_configure() {
190 ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++ 190 ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++
191 fi 191 fi
192 192
193 cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf mkspecs/common/ 193 if [ -f mkspecs/common/g++-unix.conf ] ; then
194 # mkspecs were refactored for 4.8.0
195 cp -f ${WORKDIR}/g++.conf mkspecs/common/g++-unix.conf
196 else
197 cp -f ${WORKDIR}/g++.conf mkspecs/common/g++.conf
198 fi
199 cp -f ${WORKDIR}/linux.conf mkspecs/common/
194 200
195 echo "[Paths]" > $QT_CONF_PATH 201 echo "[Paths]" > $QT_CONF_PATH
196 echo "Prefix=${prefix}/" >> $QT_CONF_PATH 202 echo "Prefix=${prefix}/" >> $QT_CONF_PATH