summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt-4.7.3
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-05-12 15:11:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-16 15:32:19 +0100
commit0de1bd8d130ab684c549271c08b60f9ea172b92d (patch)
tree2a1c4d3dac5685c13d86a871819142b2122a54a9 /meta/recipes-qt/qt4/qt-4.7.3
parenta69153b46b76626a6cd4d578f6903c580a112044 (diff)
downloadpoky-0de1bd8d130ab684c549271c08b60f9ea172b92d.tar.gz
qt4: update from 4.7.2 to 4.7.3
The Comodo certificates patch has been merged upstream so it no longer needs to be applied. Some PR values were reset and SRC_URI checksums updated but other than this there are no recipe changes. (From OE-Core rev: 57b3cbf2b7b8a716481cb3efb68b7e4c08af6703) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt-4.7.3')
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch44
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.3/g++.conf60
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch19
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.3/linux.conf66
4 files changed, 189 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch b/meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch
new file mode 100644
index 0000000000..71a04a59d2
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch
@@ -0,0 +1,44 @@
1From b1ba119f6a824dc01bd42ee00dba4a1653867b72 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Matthias=20G=C3=BCnther?= <matgnt@gmail.com>
3Date: Wed, 12 May 2010 16:52:45 +0200
4Subject: [PATCH 1/9] Added Openembedded "-crossarch" option
5
6---
7 configure | 7 ++++++-
8 1 files changed, 6 insertions(+), 1 deletions(-)
9
10diff --git a/configure b/configure
11index facd192..9d15136 100755
12--- a/configure
13+++ b/configure
14@@ -954,7 +954,7 @@ while [ "$#" -gt 0 ]; do
15 shift
16 VAL=$1
17 ;;
18- -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config)
19+ -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)
20 VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
21 shift
22 VAL="$1"
23@@ -1443,6 +1443,9 @@ while [ "$#" -gt 0 ]; do
24 xplatform)
25 XPLATFORM="$VAL"
26 ;;
27+ crossarch)
28+ CROSSARCH="$VAL"
29+ ;;
30 debug-and-release)
31 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
32 CFG_DEBUG_RELEASE="$VAL"
33@@ -2918,6 +2921,8 @@ elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then
34 CFG_ARCH=$CFG_HOST_ARCH
35 fi
36
37+CFG_ARCH="$CROSSARCH"
38+
39 if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then
40 if [ "$OPT_VERBOSE" = "yes" ]; then
41 echo " '$CFG_ARCH' is supported"
42--
431.7.0.4
44
diff --git a/meta/recipes-qt/qt4/qt-4.7.3/g++.conf b/meta/recipes-qt/qt4/qt-4.7.3/g++.conf
new file mode 100644
index 0000000000..80f925cc5e
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.7.3/g++.conf
@@ -0,0 +1,60 @@
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_SHLIB += -shared
44QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
45QMAKE_LFLAGS_SONAME += -Wl,-soname,
46QMAKE_LFLAGS_THREAD +=
47QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
48QMAKE_LFLAGS_RPATH = -Wl,-rpath-link,
49
50QMAKE_PCH_OUTPUT_EXT = .gch
51
52# -Bsymbolic-functions (ld) support
53QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
54QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
55
56# some linking helper...
57CONFIG += rpath_libdirs
58
59# for the SDK
60isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
diff --git a/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch
new file mode 100644
index 0000000000..5c588ff0f7
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch
@@ -0,0 +1,19 @@
1Index: qt-everywhere-opensource-src-4.7.0/configure
2===================================================================
3--- qt-everywhere-opensource-src-4.7.0.orig/configure 2010-09-22 15:43:51.191162141 -0400
4+++ qt-everywhere-opensource-src-4.7.0/configure 2010-09-22 15:44:35.179981232 -0400
5@@ -4921,10 +4921,10 @@
6 psql)
7 if [ "$CFG_SQL_psql" != "no" ]; then
8 # Be careful not to use native pg_config when cross building.
9- if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
10- QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
11- QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
12- fi
13+# if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
14+# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
15+# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
16+# fi
17 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
18 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
19 # But, respect PSQL_LIBS if set
diff --git a/meta/recipes-qt/qt4/qt-4.7.3/linux.conf b/meta/recipes-qt/qt4/qt-4.7.3/linux.conf
new file mode 100644
index 0000000000..a54135513b
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.7.3/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)
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 12:40:52 +0000