summaryrefslogtreecommitdiff
path: root/packages/qmake/qmake2-native/0001-fix-mkspecs.patch
blob: e0ebe512c8dee8d35f7e69a8574f7508dd957f13 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
From aa0377910cfd8d0fce6bdc9355994a4e267b1696 Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Sat, 2 Jun 2007 16:39:58 +0200
Subject: [PATCH] fix mkspecs

---
 mkspecs/common/g++.conf   |   18 +++++++++---------
 mkspecs/common/linux.conf |   26 +++++++++++++-------------
 2 files changed, 22 insertions(+), 22 deletions(-)

Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf
===================================================================
--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/g++.conf	2007-12-04 18:07:53.000000000 +0100
+++ qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf	2007-12-26 19:47:02.000000000 +0100
@@ -2,12 +2,12 @@
 # qmake configuration for common gcc
 #
 
-QMAKE_CC		= gcc
-QMAKE_CFLAGS		+= -pipe
+QMAKE_CC		= $(OE_QMAKE_CC)
+QMAKE_CFLAGS		+= -pipe $(OE_QMAKE_CFLAGS)
 QMAKE_CFLAGS_DEPS	+= -M
 QMAKE_CFLAGS_WARN_ON	+= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	+= -w
-QMAKE_CFLAGS_RELEASE	+= -O2
+QMAKE_CFLAGS_RELEASE	+= 
 QMAKE_CFLAGS_DEBUG	+= -g
 QMAKE_CFLAGS_SHLIB	+= -fPIC
 QMAKE_CFLAGS_STATIC_LIB	+= -fPIC
@@ -16,8 +16,8 @@
 QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
 QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
 
-QMAKE_CXX		= g++
-QMAKE_CXXFLAGS		+= $$QMAKE_CFLAGS
+QMAKE_CXX		= $(OE_QMAKE_CXX)
+QMAKE_CXXFLAGS		+= $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
 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_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_LFLAGS		+=
+QMAKE_LINK		= $(OE_QMAKE_LINK)
+QMAKE_LINK_SHLIB	= $(OE_QMAKE_LINK)
+QMAKE_LFLAGS		+= $(OE_QMAKE_LDFLAGS)
 QMAKE_LFLAGS_RELEASE	+=
 QMAKE_LFLAGS_DEBUG	+=
 QMAKE_LFLAGS_APP	+=
@@ -40,7 +40,7 @@
 QMAKE_LFLAGS_PLUGIN	+= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	+= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	+=
-QMAKE_RPATH		= -Wl,-rpath,
+QMAKE_RPATH		= -Wl,-rpath-link,
 
 QMAKE_PCH_OUTPUT_EXT    = .gch
 
Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf
===================================================================
--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/linux.conf	2007-12-04 18:07:53.000000000 +0100
+++ qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf	2007-12-26 19:47:02.000000000 +0100
@@ -7,26 +7,26 @@
 
 QMAKE_INCDIR          =
 QMAKE_LIBDIR          =
-QMAKE_INCDIR_X11      = /usr/X11R6/include
-QMAKE_LIBDIR_X11      = /usr/X11R6/lib
-QMAKE_INCDIR_QT       = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT       = $$[QT_INSTALL_LIBS]
-QMAKE_INCDIR_OPENGL   = /usr/X11R6/include
-QMAKE_LIBDIR_OPENGL   = /usr/X11R6/lib
+QMAKE_INCDIR_X11      = 
+QMAKE_LIBDIR_X11      = 
+QMAKE_INCDIR_QT       = $(OE_QMAKE_INCDIR_QT)
+QMAKE_LIBDIR_QT       = $(OE_QMAKE_LIBDIR_QT)
+QMAKE_INCDIR_OPENGL   = 
+QMAKE_LIBDIR_OPENGL   = 
 
 QMAKE_LIBS            =
 QMAKE_LIBS_DYNLOAD    = -ldl
-QMAKE_LIBS_X11        = -lXext -lX11 -lm
-QMAKE_LIBS_X11SM      = -lSM -lICE
+QMAKE_LIBS_X11        = $(OE_QMAKE_LIBS_X11)
+QMAKE_LIBS_X11SM      = $(OE_QMAKE_LIBS_X11SM)
 QMAKE_LIBS_NIS        = -lnsl
 QMAKE_LIBS_OPENGL     = -lGLU -lGL
 QMAKE_LIBS_OPENGL_QT  = -lGL
 QMAKE_LIBS_THREAD     = -lpthread
 
-QMAKE_MOC             = $$[QT_INSTALL_BINS]/moc
-QMAKE_UIC             = $$[QT_INSTALL_BINS]/uic
+QMAKE_MOC             = $(OE_QMAKE_MOC)
+QMAKE_UIC             = $(OE_QMAKE_UIC)
 
-QMAKE_AR              = ar cqs
+QMAKE_AR              = $(OE_QMAKE_AR) cqs
 QMAKE_RANLIB          =
 
 QMAKE_TAR             = tar -cf
@@ -38,11 +38,11 @@
 QMAKE_MOVE            = mv -f
 QMAKE_DEL_FILE        = rm -f
 QMAKE_DEL_DIR         = rmdir
-QMAKE_STRIP           = strip
+QMAKE_STRIP           = $(OE_QMAKE_STRIP)
 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)
Index: qtopia-core-opensource-src-4.3.3/mkspecs/linux-g++/qmake.conf
===================================================================
--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/linux-g++/qmake.conf	2007-12-04 18:07:53.000000000 +0100
+++ qtopia-core-opensource-src-4.3.3/mkspecs/linux-g++/qmake.conf	2007-12-26 19:47:02.000000000 +0100
@@ -5,7 +5,7 @@
 MAKEFILE_GENERATOR	= UNIX
 TEMPLATE		= app
 CONFIG			+= qt warn_on release incremental link_prl
-QT			+= core gui
+QT			+= core gui $$(OE_QMAKE_EXTRA_MODULES)
 QMAKE_INCREMENTAL_STYLE = sublib
 
 include(../common/g++.conf)
Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/unix.conf
===================================================================
--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/unix.conf	2007-12-26 19:48:20.000000000 +0100
+++ qtopia-core-opensource-src-4.3.3/mkspecs/common/unix.conf	2007-12-26 19:49:50.000000000 +0100
@@ -10,6 +10,8 @@
 QMAKE_YACC_HEADER       = $base.tab.h
 QMAKE_YACC_SOURCE       = $base.tab.c
 
+QMAKE_RCC               = $$(OE_QMAKE_RCC)
+
 QMAKE_SEPARATE_DEBUG_INFO = (test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\" ; targ=`basename $(TARGET)`; objcopy --only-keep-debug \"\$\$targ\" \"\$\$targ.debug\" && objcopy --strip-debug \"\$\$targ\" && objcopy --add-gnu-debuglink=\"\$\$targ.debug\" \"\$\$targ\" && chmod -x \"\$\$targ.debug\" ) ;
 
 QMAKE_INSTALL_SEPARATE_DEBUG_INFO = test -z "$(DESTDIR)" || cd \"$(DESTDIR)\" ; $(INSTALL_FILE) `basename $(TARGET)`.debug $(INSTALL_ROOT)/\$\$target_path/