summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/packages/qmake/qmake2-cross/0001-fix-mkspecs.patch (renamed from meta/packages/qmake/qmake2-cross-2.10a/0001-fix-mkspecs.patch)45
-rw-r--r--meta/packages/qmake/qmake2-cross/linux-oe-qmake.conf (renamed from meta/packages/qmake/qmake2-cross-2.10a/linux-oe-qmake.conf)0
-rw-r--r--meta/packages/qmake/qmake2-cross/use-lflags-last.patch (renamed from meta/packages/qmake/qmake2-cross-2.10a/use-lflags-last.patch)0
-rw-r--r--meta/packages/qmake/qmake2-cross_2.10a.bb6
4 files changed, 25 insertions, 26 deletions
diff --git a/meta/packages/qmake/qmake2-cross-2.10a/0001-fix-mkspecs.patch b/meta/packages/qmake/qmake2-cross/0001-fix-mkspecs.patch
index abebfdfa27..4ebc3dea8d 100644
--- a/meta/packages/qmake/qmake2-cross-2.10a/0001-fix-mkspecs.patch
+++ b/meta/packages/qmake/qmake2-cross/0001-fix-mkspecs.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] fix mkspecs
8 mkspecs/common/linux.conf | 26 +++++++++++++------------- 8 mkspecs/common/linux.conf | 26 +++++++++++++-------------
9 2 files changed, 22 insertions(+), 22 deletions(-) 9 2 files changed, 22 insertions(+), 22 deletions(-)
10 10
11diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf 11Index: qt-embedded-linux-opensource-src-4.5.3/mkspecs/common/g++.conf
12index f5a5c8e..4007c7e 100644 12===================================================================
13--- a/mkspecs/common/g++.conf 13--- qt-embedded-linux-opensource-src-4.5.3.orig/mkspecs/common/g++.conf
14+++ b/mkspecs/common/g++.conf 14+++ qt-embedded-linux-opensource-src-4.5.3/mkspecs/common/g++.conf
15@@ -2,12 +2,12 @@ 15@@ -2,12 +2,12 @@
16 # qmake configuration for common gcc 16 # qmake configuration for common gcc
17 # 17 #
@@ -28,7 +28,7 @@ index f5a5c8e..4007c7e 100644
28 QMAKE_CFLAGS_DEBUG += -g 28 QMAKE_CFLAGS_DEBUG += -g
29 QMAKE_CFLAGS_SHLIB += -fPIC 29 QMAKE_CFLAGS_SHLIB += -fPIC
30 QMAKE_CFLAGS_STATIC_LIB += -fPIC 30 QMAKE_CFLAGS_STATIC_LIB += -fPIC
31@@ -16,8 +16,8 @@ QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden 31@@ -16,8 +16,8 @@ QMAKE_CFLAGS_HIDESYMS += -fvisibility=
32 QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} 32 QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
33 QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE} 33 QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
34 34
@@ -39,33 +39,37 @@ index f5a5c8e..4007c7e 100644
39 QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS 39 QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
40 QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON 40 QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
41 QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF 41 QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
42@@ -30,9 +30,9 @@ QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden 42@@ -30,11 +30,11 @@ QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAG
43 QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} 43 QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
44 QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE 44 QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
45 45
46-QMAKE_LINK = g++ 46-QMAKE_LINK = g++
47-QMAKE_LINK_SHLIB = g++ 47-QMAKE_LINK_SHLIB = g++
48-QMAKE_LINK_C = gcc
49-QMAKE_LINK_C_SHLIB = gcc
48-QMAKE_LFLAGS += 50-QMAKE_LFLAGS +=
49+QMAKE_LINK = $(OE_QMAKE_LINK) 51+QMAKE_LINK = $(OE_QMAKE_LINK)
50+QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) 52+QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
53+QMAKE_LINK_C = $(OE_QMAKE_CC)
54+QMAKE_LINK_C_SHLIB = $(OE_QMAKE_CC)
51+QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) 55+QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
52 QMAKE_LFLAGS_RELEASE += 56 QMAKE_LFLAGS_RELEASE += -Wl,-O1
53 QMAKE_LFLAGS_DEBUG += 57 QMAKE_LFLAGS_DEBUG +=
54 QMAKE_LFLAGS_APP += 58 QMAKE_LFLAGS_APP +=
55@@ -40,7 +40,7 @@ QMAKE_LFLAGS_SHLIB += -shared 59@@ -43,7 +43,7 @@ QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SH
56 QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
57 QMAKE_LFLAGS_SONAME += -Wl,-soname, 60 QMAKE_LFLAGS_SONAME += -Wl,-soname,
58 QMAKE_LFLAGS_THREAD += 61 QMAKE_LFLAGS_THREAD +=
62 QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
59-QMAKE_RPATH = -Wl,-rpath, 63-QMAKE_RPATH = -Wl,-rpath,
60+QMAKE_RPATH = -Wl,-rpath-link, 64+QMAKE_RPATH = -Wl,-rpath-link,
61 65
62 QMAKE_PCH_OUTPUT_EXT = .gch 66 QMAKE_PCH_OUTPUT_EXT = .gch
63 67
64diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf 68Index: qt-embedded-linux-opensource-src-4.5.3/mkspecs/common/linux.conf
65index 3796a87..52acf16 100644 69===================================================================
66--- a/mkspecs/common/linux.conf 70--- qt-embedded-linux-opensource-src-4.5.3.orig/mkspecs/common/linux.conf
67+++ b/mkspecs/common/linux.conf 71+++ qt-embedded-linux-opensource-src-4.5.3/mkspecs/common/linux.conf
68@@ -7,26 +7,26 @@ QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD 72@@ -7,27 +7,27 @@ QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_
69 73
70 QMAKE_INCDIR = 74 QMAKE_INCDIR =
71 QMAKE_LIBDIR = 75 QMAKE_LIBDIR =
@@ -99,11 +103,13 @@ index 3796a87..52acf16 100644
99+QMAKE_UIC = $(OE_QMAKE_UIC) 103+QMAKE_UIC = $(OE_QMAKE_UIC)
100 104
101-QMAKE_AR = ar cqs 105-QMAKE_AR = ar cqs
106-QMAKE_OBJCOPY = objcopy
102+QMAKE_AR = $(OE_QMAKE_AR) cqs 107+QMAKE_AR = $(OE_QMAKE_AR) cqs
108+QMAKE_OBJCOPY = $(OE_QMAKE_OBJCOPY)
103 QMAKE_RANLIB = 109 QMAKE_RANLIB =
104 110
105 QMAKE_TAR = tar -cf 111 QMAKE_TAR = tar -cf
106@@ -38,11 +38,11 @@ QMAKE_COPY_DIR = $(COPY) -r 112@@ -39,7 +39,7 @@ QMAKE_COPY_DIR = $(COPY) -r
107 QMAKE_MOVE = mv -f 113 QMAKE_MOVE = mv -f
108 QMAKE_DEL_FILE = rm -f 114 QMAKE_DEL_FILE = rm -f
109 QMAKE_DEL_DIR = rmdir 115 QMAKE_DEL_DIR = rmdir
@@ -112,12 +118,3 @@ index 3796a87..52acf16 100644
112 QMAKE_STRIPFLAGS_LIB += --strip-unneeded 118 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
113 QMAKE_CHK_DIR_EXISTS = test -d 119 QMAKE_CHK_DIR_EXISTS = test -d
114 QMAKE_MKDIR = mkdir -p 120 QMAKE_MKDIR = mkdir -p
115 QMAKE_INSTALL_FILE = install -m 644 -p
116 QMAKE_INSTALL_PROGRAM = install -m 755 -p
117
118-include(unix.conf)
119\ No newline at end of file
120+include(unix.conf)
121--
1221.5.1.6
123
diff --git a/meta/packages/qmake/qmake2-cross-2.10a/linux-oe-qmake.conf b/meta/packages/qmake/qmake2-cross/linux-oe-qmake.conf
index f58481a693..f58481a693 100644
--- a/meta/packages/qmake/qmake2-cross-2.10a/linux-oe-qmake.conf
+++ b/meta/packages/qmake/qmake2-cross/linux-oe-qmake.conf
diff --git a/meta/packages/qmake/qmake2-cross-2.10a/use-lflags-last.patch b/meta/packages/qmake/qmake2-cross/use-lflags-last.patch
index 4197dbbf64..4197dbbf64 100644
--- a/meta/packages/qmake/qmake2-cross-2.10a/use-lflags-last.patch
+++ b/meta/packages/qmake/qmake2-cross/use-lflags-last.patch
diff --git a/meta/packages/qmake/qmake2-cross_2.10a.bb b/meta/packages/qmake/qmake2-cross_2.10a.bb
index b8b73c12d8..60f738b9ce 100644
--- a/meta/packages/qmake/qmake2-cross_2.10a.bb
+++ b/meta/packages/qmake/qmake2-cross_2.10a.bb
@@ -3,9 +3,9 @@ PRIORITY = "optional"
3HOMEPAGE = "http://www.trolltech.com" 3HOMEPAGE = "http://www.trolltech.com"
4SECTION = "devel" 4SECTION = "devel"
5LICENSE = "GPL" 5LICENSE = "GPL"
6PR = "r1" 6PR = "r2"
7 7
8QTVER = "qtopia-core-opensource-src-4.3.2" 8QTVER = "qt-embedded-linux-opensource-src-4.5.3"
9 9
10SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \ 10SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \
11 file://0001-fix-mkspecs.patch;patch=1 \ 11 file://0001-fix-mkspecs.patch;patch=1 \
@@ -20,6 +20,7 @@ inherit autotools cross
20 20
21export QTDIR = "${S}" 21export QTDIR = "${S}"
22EXTRA_OEMAKE = "-e" 22EXTRA_OEMAKE = "-e"
23EXTRA_OECONF = "-opensource"
23 24
24do_configure() { 25do_configure() {
25 # Install the OE build templates 26 # Install the OE build templates
@@ -41,6 +42,7 @@ do_configure() {
41 export OE_QMAKE_LDFLAGS="${LDFLAGS}" 42 export OE_QMAKE_LDFLAGS="${LDFLAGS}"
42 export OE_QMAKE_LINK="${CCLD}" 43 export OE_QMAKE_LINK="${CCLD}"
43 export OE_QMAKE_AR="${AR}" 44 export OE_QMAKE_AR="${AR}"
45 export OE_QMAKE_OBJCOPY="${OBJCOPY}"
44 export OE_QMAKE_STRIP="${STRIP}" 46 export OE_QMAKE_STRIP="${STRIP}"
45 export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic" 47 export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic"
46 export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc" 48 export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc"