summaryrefslogtreecommitdiffstats
path: root/meta-extras/packages/qmake/qmake2-cross/0001-fix-mkspecs.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-extras/packages/qmake/qmake2-cross/0001-fix-mkspecs.patch')
-rw-r--r--meta-extras/packages/qmake/qmake2-cross/0001-fix-mkspecs.patch120
1 files changed, 120 insertions, 0 deletions
diff --git a/meta-extras/packages/qmake/qmake2-cross/0001-fix-mkspecs.patch b/meta-extras/packages/qmake/qmake2-cross/0001-fix-mkspecs.patch
new file mode 100644
index 0000000000..4ebc3dea8d
--- /dev/null
+++ b/meta-extras/packages/qmake/qmake2-cross/0001-fix-mkspecs.patch
@@ -0,0 +1,120 @@
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
11Index: qt-embedded-linux-opensource-src-4.5.3/mkspecs/common/g++.conf
12===================================================================
13--- qt-embedded-linux-opensource-src-4.5.3.orig/mkspecs/common/g++.conf
14+++ qt-embedded-linux-opensource-src-4.5.3/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=
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,11 +30,11 @@ QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAG
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_LINK_C = gcc
49-QMAKE_LINK_C_SHLIB = gcc
50-QMAKE_LFLAGS +=
51+QMAKE_LINK = $(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)
55+QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
56 QMAKE_LFLAGS_RELEASE += -Wl,-O1
57 QMAKE_LFLAGS_DEBUG +=
58 QMAKE_LFLAGS_APP +=
59@@ -43,7 +43,7 @@ QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SH
60 QMAKE_LFLAGS_SONAME += -Wl,-soname,
61 QMAKE_LFLAGS_THREAD +=
62 QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
63-QMAKE_RPATH = -Wl,-rpath,
64+QMAKE_RPATH = -Wl,-rpath-link,
65
66 QMAKE_PCH_OUTPUT_EXT = .gch
67
68Index: qt-embedded-linux-opensource-src-4.5.3/mkspecs/common/linux.conf
69===================================================================
70--- qt-embedded-linux-opensource-src-4.5.3.orig/mkspecs/common/linux.conf
71+++ qt-embedded-linux-opensource-src-4.5.3/mkspecs/common/linux.conf
72@@ -7,27 +7,27 @@ QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_
73
74 QMAKE_INCDIR =
75 QMAKE_LIBDIR =
76-QMAKE_INCDIR_X11 = /usr/X11R6/include
77-QMAKE_LIBDIR_X11 = /usr/X11R6/lib
78-QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
79-QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
80-QMAKE_INCDIR_OPENGL = /usr/X11R6/include
81-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
82+QMAKE_INCDIR_X11 =
83+QMAKE_LIBDIR_X11 =
84+QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT)
85+QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT)
86+QMAKE_INCDIR_OPENGL =
87+QMAKE_LIBDIR_OPENGL =
88
89 QMAKE_LIBS =
90 QMAKE_LIBS_DYNLOAD = -ldl
91-QMAKE_LIBS_X11 = -lXext -lX11 -lm
92-QMAKE_LIBS_X11SM = -lSM -lICE
93+QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11)
94+QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
95 QMAKE_LIBS_NIS = -lnsl
96 QMAKE_LIBS_OPENGL = -lGLU -lGL
97 QMAKE_LIBS_OPENGL_QT = -lGL
98 QMAKE_LIBS_THREAD = -lpthread
99
100-QMAKE_MOC = $$[QT_INSTALL_BINS]/moc
101-QMAKE_UIC = $$[QT_INSTALL_BINS]/uic
102+QMAKE_MOC = $(OE_QMAKE_MOC)
103+QMAKE_UIC = $(OE_QMAKE_UIC)
104
105-QMAKE_AR = ar cqs
106-QMAKE_OBJCOPY = objcopy
107+QMAKE_AR = $(OE_QMAKE_AR) cqs
108+QMAKE_OBJCOPY = $(OE_QMAKE_OBJCOPY)
109 QMAKE_RANLIB =
110
111 QMAKE_TAR = tar -cf
112@@ -39,7 +39,7 @@ QMAKE_COPY_DIR = $(COPY) -r
113 QMAKE_MOVE = mv -f
114 QMAKE_DEL_FILE = rm -f
115 QMAKE_DEL_DIR = rmdir
116-QMAKE_STRIP = strip
117+QMAKE_STRIP = $(OE_QMAKE_STRIP)
118 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
119 QMAKE_CHK_DIR_EXISTS = test -d
120 QMAKE_MKDIR = mkdir -p