sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

qmake2-cross: update the 2.10a recipe 

The source tarball filename has changed.
Rebased the 0001-fix-mkspecs.patch to the newer code.
The versions of the qmake2 is still 2.10a

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
This commit is contained in:
Nitin A Kamble 2010-07-02 01:45:15 -07:00 committed by Richard Purdie
parent a60863a0a6
commit 6a5a351c7d
4 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
meta/packages/qmake/qmake2-cross-2.10a/0001-fix-mkspecs.patch → meta/packages/qmake/qmake2-cross/0001-fix-mkspecs.patch
View File

@ -8,10 +8,10 @@ Subject: [PATCH] fix mkspecs
mkspecs/common/linux.conf | 26 +++++++++++++-------------
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf
index f5a5c8e..4007c7e 100644
--- a/mkspecs/common/g++.conf
+++ b/mkspecs/common/g++.conf
Index: qt-embedded-linux-opensource-src-4.5.3/mkspecs/common/g++.conf
===================================================================
--- qt-embedded-linux-opensource-src-4.5.3.orig/mkspecs/common/g++.conf
+++ qt-embedded-linux-opensource-src-4.5.3/mkspecs/common/g++.conf
@@ -2,12 +2,12 @@
# qmake configuration for common gcc
#
@ -28,7 +28,7 @@ index f5a5c8e..4007c7e 100644
QMAKE_CFLAGS_DEBUG += -g
QMAKE_CFLAGS_SHLIB += -fPIC
QMAKE_CFLAGS_STATIC_LIB += -fPIC
@@ -16,8 +16,8 @@ QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
@@ -16,8 +16,8 @@ QMAKE_CFLAGS_HIDESYMS += -fvisibility=
QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
@ -39,33 +39,37 @@ index f5a5c8e..4007c7e 100644
QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
@@ -30,9 +30,9 @@ QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
@@ -30,11 +30,11 @@ QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAG
QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
-QMAKE_LINK = g++
-QMAKE_LINK_SHLIB = g++
-QMAKE_LINK_C = gcc
-QMAKE_LINK_C_SHLIB = gcc
-QMAKE_LFLAGS +=
+QMAKE_LINK = $(OE_QMAKE_LINK)
+QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
+QMAKE_LINK_C = $(OE_QMAKE_CC)
+QMAKE_LINK_C_SHLIB = $(OE_QMAKE_CC)
+QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
QMAKE_LFLAGS_RELEASE +=
QMAKE_LFLAGS_RELEASE += -Wl,-O1
QMAKE_LFLAGS_DEBUG +=
QMAKE_LFLAGS_APP +=
@@ -40,7 +40,7 @@ QMAKE_LFLAGS_SHLIB += -shared
QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
@@ -43,7 +43,7 @@ QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SH
QMAKE_LFLAGS_SONAME += -Wl,-soname,
QMAKE_LFLAGS_THREAD +=
QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
-QMAKE_RPATH = -Wl,-rpath,
+QMAKE_RPATH = -Wl,-rpath-link,
QMAKE_PCH_OUTPUT_EXT = .gch
diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
index 3796a87..52acf16 100644
--- a/mkspecs/common/linux.conf
+++ b/mkspecs/common/linux.conf
@@ -7,26 +7,26 @@ QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD
Index: qt-embedded-linux-opensource-src-4.5.3/mkspecs/common/linux.conf
===================================================================
--- qt-embedded-linux-opensource-src-4.5.3.orig/mkspecs/common/linux.conf
+++ qt-embedded-linux-opensource-src-4.5.3/mkspecs/common/linux.conf
@@ -7,27 +7,27 @@ QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_
QMAKE_INCDIR =
QMAKE_LIBDIR =
@ -99,11 +103,13 @@ index 3796a87..52acf16 100644
+QMAKE_UIC = $(OE_QMAKE_UIC)
-QMAKE_AR = ar cqs
-QMAKE_OBJCOPY = objcopy
+QMAKE_AR = $(OE_QMAKE_AR) cqs
+QMAKE_OBJCOPY = $(OE_QMAKE_OBJCOPY)
QMAKE_RANLIB =
QMAKE_TAR = tar -cf
@@ -38,11 +38,11 @@ QMAKE_COPY_DIR = $(COPY) -r
@@ -39,7 +39,7 @@ QMAKE_COPY_DIR = $(COPY) -r
QMAKE_MOVE = mv -f
QMAKE_DEL_FILE = rm -f
QMAKE_DEL_DIR = rmdir
@ -112,12 +118,3 @@ index 3796a87..52acf16 100644
QMAKE_STRIPFLAGS_LIB += --strip-unneeded
QMAKE_CHK_DIR_EXISTS = test -d
QMAKE_MKDIR = mkdir -p
QMAKE_INSTALL_FILE = install -m 644 -p
QMAKE_INSTALL_PROGRAM = install -m 755 -p
-include(unix.conf)
\ No newline at end of file
+include(unix.conf)
--
1.5.1.6

0
meta/packages/qmake/qmake2-cross-2.10a/linux-oe-qmake.conf → meta/packages/qmake/qmake2-cross/linux-oe-qmake.conf
View File

0
meta/packages/qmake/qmake2-cross-2.10a/use-lflags-last.patch → meta/packages/qmake/qmake2-cross/use-lflags-last.patch
View File

6
meta/packages/qmake/qmake2-cross_2.10a.bb
View File

@ -3,9 +3,9 @@ PRIORITY = "optional"
HOMEPAGE = "http://www.trolltech.com"
SECTION = "devel"
LICENSE = "GPL"
PR = "r1"
PR = "r2"
QTVER = "qtopia-core-opensource-src-4.3.2"
QTVER = "qt-embedded-linux-opensource-src-4.5.3"
SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \
file://0001-fix-mkspecs.patch;patch=1 \
@ -20,6 +20,7 @@ inherit autotools cross
export QTDIR = "${S}"
EXTRA_OEMAKE = "-e"
EXTRA_OECONF = "-opensource"
do_configure() {
# Install the OE build templates
@ -41,6 +42,7 @@ do_configure() {
export OE_QMAKE_LDFLAGS="${LDFLAGS}"
export OE_QMAKE_LINK="${CCLD}"
export OE_QMAKE_AR="${AR}"
export OE_QMAKE_OBJCOPY="${OBJCOPY}"
export OE_QMAKE_STRIP="${STRIP}"
export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic"
export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc"