summaryrefslogtreecommitdiffstats
path: root/meta/packages/qmake/qmake2-cross-2.10a
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-12-12 08:43:07 +0000
committerRichard Purdie <richard@openedhand.com>2007-12-12 08:43:07 +0000
commitcfd98f5000b28c9f2958600ba8cebf457ca8f67c (patch)
tree1b2d6c0bd8c0ace62afaba41539d2713b2f9488e /meta/packages/qmake/qmake2-cross-2.10a
parent4db23a9e9061313d0c4c31c7f1b6915e9b1c0d35 (diff)
downloadpoky-cfd98f5000b28c9f2958600ba8cebf457ca8f67c.tar.gz
qmake: Turn native package into a cross package since it touches target staging
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3333 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/qmake/qmake2-cross-2.10a')
-rw-r--r--meta/packages/qmake/qmake2-cross-2.10a/0001-fix-mkspecs.patch123
-rw-r--r--meta/packages/qmake/qmake2-cross-2.10a/linux-oe-qmake.conf1
-rw-r--r--meta/packages/qmake/qmake2-cross-2.10a/use-lflags-last.patch22
3 files changed, 146 insertions, 0 deletions
diff --git a/meta/packages/qmake/qmake2-cross-2.10a/0001-fix-mkspecs.patch b/meta/packages/qmake/qmake2-cross-2.10a/0001-fix-mkspecs.patch
new file mode 100644
index 0000000000..abebfdfa27
--- /dev/null
+++ b/meta/packages/qmake/qmake2-cross-2.10a/0001-fix-mkspecs.patch
@@ -0,0 +1,123 @@
1From 594157753a24d0575aaf948dc0e9500f6bdb2178 Mon Sep 17 00:00:00 2001
2From: Michael Krelin <hacker@klever.net>
3Date: Sat, 2 Jun 2007 16:39:58 +0200
4Subject: [PATCH] fix mkspecs
5
6---
7 mkspecs/common/g++.conf | 18 +++++++++---------
8 mkspecs/common/linux.conf | 26 +++++++++++++-------------
9 2 files changed, 22 insertions(+), 22 deletions(-)
10
11diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf
12index f5a5c8e..4007c7e 100644
13--- a/mkspecs/common/g++.conf
14+++ b/mkspecs/common/g++.conf
15@@ -2,12 +2,12 @@
16 # qmake configuration for common gcc
17 #
18
19-QMAKE_CC = gcc
20-QMAKE_CFLAGS += -pipe
21+QMAKE_CC = $(OE_QMAKE_CC)
22+QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS)
23 QMAKE_CFLAGS_DEPS += -M
24 QMAKE_CFLAGS_WARN_ON += -Wall -W
25 QMAKE_CFLAGS_WARN_OFF += -w
26-QMAKE_CFLAGS_RELEASE += -O2
27+QMAKE_CFLAGS_RELEASE += -O2
28 QMAKE_CFLAGS_DEBUG += -g
29 QMAKE_CFLAGS_SHLIB += -fPIC
30 QMAKE_CFLAGS_STATIC_LIB += -fPIC
31@@ -16,8 +16,8 @@ QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
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}
34
35-QMAKE_CXX = g++
36-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS
37+QMAKE_CXX = $(OE_QMAKE_CXX)
38+QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
39 QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
40 QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
41 QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
42@@ -30,9 +30,9 @@ QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
43 QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
44 QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
45
46-QMAKE_LINK = g++
47-QMAKE_LINK_SHLIB = g++
48-QMAKE_LFLAGS +=
49+QMAKE_LINK = $(OE_QMAKE_LINK)
50+QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
51+QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
52 QMAKE_LFLAGS_RELEASE +=
53 QMAKE_LFLAGS_DEBUG +=
54 QMAKE_LFLAGS_APP +=
55@@ -40,7 +40,7 @@ QMAKE_LFLAGS_SHLIB += -shared
56 QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
57 QMAKE_LFLAGS_SONAME += -Wl,-soname,
58 QMAKE_LFLAGS_THREAD +=
59-QMAKE_RPATH = -Wl,-rpath,
60+QMAKE_RPATH = -Wl,-rpath-link,
61
62 QMAKE_PCH_OUTPUT_EXT = .gch
63
64diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
65index 3796a87..52acf16 100644
66--- a/mkspecs/common/linux.conf
67+++ b/mkspecs/common/linux.conf
68@@ -7,26 +7,26 @@ QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD
69
70 QMAKE_INCDIR =
71 QMAKE_LIBDIR =
72-QMAKE_INCDIR_X11 = /usr/X11R6/include
73-QMAKE_LIBDIR_X11 = /usr/X11R6/lib
74-QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
75-QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
76-QMAKE_INCDIR_OPENGL = /usr/X11R6/include
77-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
78+QMAKE_INCDIR_X11 =
79+QMAKE_LIBDIR_X11 =
80+QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT)
81+QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT)
82+QMAKE_INCDIR_OPENGL =
83+QMAKE_LIBDIR_OPENGL =
84
85 QMAKE_LIBS =
86 QMAKE_LIBS_DYNLOAD = -ldl
87-QMAKE_LIBS_X11 = -lXext -lX11 -lm
88-QMAKE_LIBS_X11SM = -lSM -lICE
89+QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11)
90+QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
91 QMAKE_LIBS_NIS = -lnsl
92 QMAKE_LIBS_OPENGL = -lGLU -lGL
93 QMAKE_LIBS_OPENGL_QT = -lGL
94 QMAKE_LIBS_THREAD = -lpthread
95
96-QMAKE_MOC = $$[QT_INSTALL_BINS]/moc
97-QMAKE_UIC = $$[QT_INSTALL_BINS]/uic
98+QMAKE_MOC = $(OE_QMAKE_MOC)
99+QMAKE_UIC = $(OE_QMAKE_UIC)
100
101-QMAKE_AR = ar cqs
102+QMAKE_AR = $(OE_QMAKE_AR) cqs
103 QMAKE_RANLIB =
104
105 QMAKE_TAR = tar -cf
106@@ -38,11 +38,11 @@ QMAKE_COPY_DIR = $(COPY) -r
107 QMAKE_MOVE = mv -f
108 QMAKE_DEL_FILE = rm -f
109 QMAKE_DEL_DIR = rmdir
110-QMAKE_STRIP = strip
111+QMAKE_STRIP = $(OE_QMAKE_STRIP)
112 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
113 QMAKE_CHK_DIR_EXISTS = test -d
114 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-2.10a/linux-oe-qmake.conf
new file mode 100644
index 0000000000..f58481a693
--- /dev/null
+++ b/meta/packages/qmake/qmake2-cross-2.10a/linux-oe-qmake.conf
@@ -0,0 +1 @@
include(../linux-g++/qmake.conf)
diff --git a/meta/packages/qmake/qmake2-cross-2.10a/use-lflags-last.patch b/meta/packages/qmake/qmake2-cross-2.10a/use-lflags-last.patch
new file mode 100644
index 0000000000..4197dbbf64
--- /dev/null
+++ b/meta/packages/qmake/qmake2-cross-2.10a/use-lflags-last.patch
@@ -0,0 +1,22 @@
1Index: qtopia-core-opensource-src-4.3.1/qmake/generators/unix/unixmake2.cpp
2===================================================================
3--- qtopia-core-opensource-src-4.3.1.orig/qmake/generators/unix/unixmake2.cpp 2007-10-07 13:45:26.000000000 +0200
4+++ qtopia-core-opensource-src-4.3.1/qmake/generators/unix/unixmake2.cpp 2007-10-07 13:57:09.000000000 +0200
5@@ -416,7 +416,7 @@
6 t << "\n\t" << mkdir_p_asstring(destdir) << "\n\t";
7 if(!project->isEmpty("QMAKE_PRE_LINK"))
8 t << var("QMAKE_PRE_LINK") << "\n\t";
9- t << "$(LINK) $(LFLAGS) -o $(TARGET) " << incr_deps << " " << incr_objs << " $(OBJCOMP) $(LIBS)";
10+ t << "$(LINK) -o $(TARGET) " << incr_deps << " " << incr_objs << " $(OBJCOMP) $(LIBS) $(LFLAGS)";
11 if(!project->isEmpty("QMAKE_POST_LINK"))
12 t << "\n\t" << var("QMAKE_POST_LINK");
13 t << endl << endl;
14@@ -430,7 +430,7 @@
15 t << mkdir_p_asstring(destdir) << "\n\t";
16 if(!project->isEmpty("QMAKE_PRE_LINK"))
17 t << var("QMAKE_PRE_LINK") << "\n\t";
18- t << "$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)";
19+ t << "$(LINK) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) $(LFLAGS)";
20 if(!project->isEmpty("QMAKE_POST_LINK"))
21 t << "\n\t" << var("QMAKE_POST_LINK");
22 t << endl << endl;