add a patch to fix xsupplicant build on 2.6.19 (see [6052])
[openwrt/svn-archive/archive.git] / libs / libupnp / patches / opt-flags.patch
1 diff -ruN libupnp-1.2.1-orig/ixml/src/Makefile libupnp-1.2.1-1/ixml/src/Makefile
2 --- libupnp-1.2.1-orig/ixml/src/Makefile 2003-01-14 23:06:12.000000000 +0100
3 +++ libupnp-1.2.1-1/ixml/src/Makefile 2005-05-15 19:32:46.000000000 +0200
4 @@ -47,6 +47,8 @@
5 STRIP = strip
6 endif
7
8 +OPT_FLAGS = -Os
9 +
10 ifeq ($(INSURE), 1)
11 CC = insure
12 endif
13 @@ -71,7 +73,7 @@
14 ifeq ($(DEBUG),1)
15 DEBUG_FLAGS = -O -g -DDEBUG
16 else
17 - DEBUG_FLAGS = -Os -DNDEBUG
18 + DEBUG_FLAGS = $(OPT_FLAGS) -DNDEBUG
19 STRIPU = $(STRIP) $(OBJ_DIR)/$(TARGET_OUTPUT)
20 endif
21
22 diff -ruN libupnp-1.2.1-orig/threadutil/src/Makefile libupnp-1.2.1-1/threadutil/src/Makefile
23 --- libupnp-1.2.1-orig/threadutil/src/Makefile 2003-01-14 23:06:12.000000000 +0100
24 +++ libupnp-1.2.1-1/threadutil/src/Makefile 2005-05-15 19:32:33.000000000 +0200
25 @@ -44,6 +44,8 @@
26 STRIP = strip
27 endif
28
29 +OPT_FLAGS = -Os
30 +
31 DEPDIR = .deps
32 df = $(DEPDIR)/$(*F)
33
34 @@ -74,7 +76,7 @@
35 OBJ_DIR = obj/debug/$(DIR_PATH)
36 CLEAN_PATH=debug/$(DIR_PATH)
37 else
38 -DEBUG_FLAGS += -Os -DNO_DEBUG -DNDEBUG
39 +DEBUG_FLAGS += $(OPT_FLAGS) -DNO_DEBUG -DNDEBUG
40 LOCALDIR +=../bin/$(DIR_PATH)
41 TARGET_OUTPUT = libthreadutil.so
42 OBJ_DIR = obj/$(DIR_PATH)
43 diff -ruN libupnp-1.2.1-orig/upnp/src/api/makefile libupnp-1.2.1-1/upnp/src/api/makefile
44 --- libupnp-1.2.1-orig/upnp/src/api/makefile 2003-01-14 23:06:13.000000000 +0100
45 +++ libupnp-1.2.1-1/upnp/src/api/makefile 2005-05-15 19:33:04.000000000 +0200
46 @@ -43,6 +43,8 @@
47 STRIP = strip
48 endif
49
50 +OPT_FLAGS = -Os
51 +
52 ifeq ($(INSURE), 1)
53 CC = insure
54 endif
55 @@ -64,7 +66,7 @@
56 OBJ_DIR = obj/debug/$(DIR_PATH)
57 UPNP_LIB_DIR = ../lib/debug/$(DIR_PATH)
58 else
59 -CFLAGS += -Os -DNDEBUG
60 +CFLAGS += $(OPT_FLAGS) -DNDEBUG
61 OBJ_DIR = obj/$(DIR_PATH)
62 UPNP_LIB_DIR = ../lib/$(DIR_PATH)
63 endif
64 diff -ruN libupnp-1.2.1-orig/upnp/src/gena/Makefile libupnp-1.2.1-1/upnp/src/gena/Makefile
65 --- libupnp-1.2.1-orig/upnp/src/gena/Makefile 2003-01-14 23:06:13.000000000 +0100
66 +++ libupnp-1.2.1-1/upnp/src/gena/Makefile 2005-05-15 19:33:32.000000000 +0200
67 @@ -43,6 +43,8 @@
68 STRIP = strip
69 endif
70
71 +OPT_FLAGS = -Os
72 +
73 ifeq ($(INSURE),1)
74 CC=insure
75 endif
76 @@ -60,7 +62,7 @@
77 OBJ_DIR = obj/debug/$(DIR_PATH)
78 UPNP_LIB_DIR = $(LIBS)/debug/$(DIR_PATH)
79 else
80 -CFLAGS += -Os -DNO_DEBUG -DNDEBUG
81 +CFLAGS += $(OPT_FLAGS) -DNO_DEBUG -DNDEBUG
82 OBJ_DIR = obj/$(DIR_PATH)
83 UPNP_LIB_DIR = $(LIBS)/$(DIR_PATH)
84 endif
85 diff -ruN libupnp-1.2.1-orig/upnp/src/genlib/client_table/Makefile libupnp-1.2.1-1/upnp/src/genlib/client_table/Makefile
86 --- libupnp-1.2.1-orig/upnp/src/genlib/client_table/Makefile 2003-01-14 23:06:13.000000000 +0100
87 +++ libupnp-1.2.1-1/upnp/src/genlib/client_table/Makefile 2005-05-15 19:33:41.000000000 +0200
88 @@ -44,6 +44,8 @@
89 STRIP = strip
90 endif
91
92 +OPT_FLAGS = -Os
93 +
94 ifeq ($(INSURE),1)
95 CC=insure
96 endif
97 @@ -73,7 +75,7 @@
98 else
99 OBJ_DIR = obj/$(DIR_PATH)
100 UPNP_LIB_DIR = ../../lib/$(DIR_PATH)
101 -CFLAGS += -Os -D_REENTRANT -DNO_DEBUG -DNDEBUG
102 +CFLAGS += $(OPT_FLAGS) -D_REENTRANT -DNO_DEBUG -DNDEBUG
103 endif
104
105 TARGET_OUTPUT = $(UPNP_LIB_DIR)client_table.o
106 diff -ruN libupnp-1.2.1-orig/upnp/src/genlib/miniserver/Makefile libupnp-1.2.1-1/upnp/src/genlib/miniserver/Makefile
107 --- libupnp-1.2.1-orig/upnp/src/genlib/miniserver/Makefile 2003-01-14 23:06:13.000000000 +0100
108 +++ libupnp-1.2.1-1/upnp/src/genlib/miniserver/Makefile 2005-05-15 19:33:56.000000000 +0200
109 @@ -44,6 +44,8 @@
110 STRIP = strip
111 endif
112
113 +OPT_FLAGS = -Os
114 +
115 ifeq ($(INSURE),1)
116 CC=insure
117 endif
118 @@ -60,7 +62,7 @@
119 OBJ_DIR = obj/debug/$(DIR_PATH)
120 UPNP_LIB_DIR = ../../lib/debug/$(DIR_PATH)
121 else
122 -CFLAGS += -Os -DNO_DEBUG -DNDEBUG
123 +CFLAGS += $(OPT_FLAGS) -DNO_DEBUG -DNDEBUG
124 OBJ_DIR = obj/$(DIR_PATH)
125 UPNP_LIB_DIR = ../../lib/$(DIR_PATH)
126 endif
127 diff -ruN libupnp-1.2.1-orig/upnp/src/genlib/net/Makefile libupnp-1.2.1-1/upnp/src/genlib/net/Makefile
128 --- libupnp-1.2.1-orig/upnp/src/genlib/net/Makefile 2003-01-14 23:06:13.000000000 +0100
129 +++ libupnp-1.2.1-1/upnp/src/genlib/net/Makefile 2005-05-15 19:34:07.000000000 +0200
130 @@ -44,6 +44,8 @@
131 STRIP = strip
132 endif
133
134 +OPT_FLAGS = -Os
135 +
136 LIBS=../../lib
137 UPNP_INC_DIR = -I../../inc -I../../../inc -I ../../../../threadutil/src/win32 \
138 -I ../../../../threadutil/src -I ../../../../ixml/inc
139 @@ -59,7 +61,7 @@
140 OBJ_DIR = obj/debug/$(DIR_PATH)
141 UPNP_LIB_DIR = $(LIBS)/debug/$(DIR_PATH)
142 else
143 -CFLAGS += -Os -DNO_DEBUG -DNDEBUG
144 +CFLAGS += $(OPT_FLAGS) -DNO_DEBUG -DNDEBUG
145 OBJ_DIR = obj/$(DIR_PATH)
146 UPNP_LIB_DIR = $(LIBS)/$(DIR_PATH)
147 endif
148 diff -ruN libupnp-1.2.1-orig/upnp/src/genlib/net/http/Makefile libupnp-1.2.1-1/upnp/src/genlib/net/http/Makefile
149 --- libupnp-1.2.1-orig/upnp/src/genlib/net/http/Makefile 2003-01-14 23:06:13.000000000 +0100
150 +++ libupnp-1.2.1-1/upnp/src/genlib/net/http/Makefile 2005-05-15 19:34:18.000000000 +0200
151 @@ -44,6 +44,8 @@
152 STRIP = strip
153 endif
154
155 +OPT_FLAGS = -Os
156 +
157 UPNP_INC_DIR = -I ../../../../inc -I ../../../inc \
158 -I ../../../../../threadutil/src/win32 \
159 -I ../../../../../threadutil/src -I ../../../../../ixml/inc
160 @@ -57,7 +59,7 @@
161 OBJ_DIR = obj/debug/$(DIR_PATH)
162 UPNP_LIB_DIR = $(LIBS)/debug/$(DIR_PATH)
163 else
164 -CFLAGS += -Os -DNO_DEBUG -DNDEBUG
165 +CFLAGS += $(OPT_FLAGS) -DNO_DEBUG -DNDEBUG
166 OBJ_DIR = obj/$(DIR_PATH)
167 UPNP_LIB_DIR = $(LIBS)/$(DIR_PATH)
168 endif
169 diff -ruN libupnp-1.2.1-orig/upnp/src/genlib/net/uri/makefile libupnp-1.2.1-1/upnp/src/genlib/net/uri/makefile
170 --- libupnp-1.2.1-orig/upnp/src/genlib/net/uri/makefile 2003-01-14 23:06:13.000000000 +0100
171 +++ libupnp-1.2.1-1/upnp/src/genlib/net/uri/makefile 2005-05-15 19:35:22.000000000 +0200
172 @@ -44,6 +44,8 @@
173 STRIP = strip
174 endif
175
176 +OPT_FLAGS = -Os
177 +
178 LIBS = ../../../lib
179
180
181 @@ -59,7 +61,7 @@
182 OBJ_DIR = obj/debug/$(DIR_PATH)
183 UPNP_LIB_DIR = $(LIBS)/debug/$(DIR_PATH)
184 else
185 -CFLAGS += -Os -DNO_DEBUG -DNDEBUG
186 +CFLAGS += $(OPT_FLAGS) -DNO_DEBUG -DNDEBUG
187 OBJ_DIR = obj/$(DIR_PATH)
188 UPNP_LIB_DIR = $(LIBS)/$(DIR_PATH)
189 endif
190 diff -ruN libupnp-1.2.1-orig/upnp/src/genlib/service_table/Makefile libupnp-1.2.1-1/upnp/src/genlib/service_table/Makefile
191 --- libupnp-1.2.1-orig/upnp/src/genlib/service_table/Makefile 2003-01-14 23:06:14.000000000 +0100
192 +++ libupnp-1.2.1-1/upnp/src/genlib/service_table/Makefile 2005-05-15 19:35:33.000000000 +0200
193 @@ -44,6 +44,8 @@
194 STRIP = strip
195 endif
196
197 +OPT_FLAGS = -Os
198 +
199 ifeq ($(INSURE),1)
200 CC=insure
201 endif
202 @@ -61,7 +63,7 @@
203 OBJ_DIR = obj/debug/$(DIR_PATH)
204 UPNP_LIB_DIR = $(LIBS)/debug/$(DIR_PATH)
205 else
206 -CFLAGS += -Os -DNO_DEBUG -DNDEBUG
207 +CFLAGS += $(OPT_FLAGS) -DNO_DEBUG -DNDEBUG
208 OBJ_DIR = obj/$(DIR_PATH)
209 UPNP_LIB_DIR = $(LIBS)/$(DIR_PATH)
210 endif
211 diff -ruN libupnp-1.2.1-orig/upnp/src/genlib/util/Makefile libupnp-1.2.1-1/upnp/src/genlib/util/Makefile
212 --- libupnp-1.2.1-orig/upnp/src/genlib/util/Makefile 2003-01-14 23:06:14.000000000 +0100
213 +++ libupnp-1.2.1-1/upnp/src/genlib/util/Makefile 2005-05-15 19:35:44.000000000 +0200
214 @@ -44,6 +44,8 @@
215 STRIP = strip
216 endif
217
218 +OPT_FLAGS = -Os
219 +
220 ifeq ($(INSURE),1)
221 CC=insure
222 endif
223 @@ -62,7 +64,7 @@
224 OBJ_DIR = obj/debug/$(DIR_PATH)
225 UPNP_LIB_DIR = $(LIBS)/debug/$(DIR_PATH)
226 else
227 -CFLAGS += -Os -DNO_DEBUG -DNDEBUG
228 +CFLAGS += $(OPT_FLAGS) -DNO_DEBUG -DNDEBUG
229 OBJ_DIR = obj/$(DIR_PATH)
230 UPNP_LIB_DIR = $(LIBS)/$(DIR_PATH)
231 endif
232 diff -ruN libupnp-1.2.1-orig/upnp/src/soap/makefile libupnp-1.2.1-1/upnp/src/soap/makefile
233 --- libupnp-1.2.1-orig/upnp/src/soap/makefile 2003-01-14 23:06:14.000000000 +0100
234 +++ libupnp-1.2.1-1/upnp/src/soap/makefile 2005-05-15 19:35:55.000000000 +0200
235 @@ -44,6 +44,8 @@
236 STRIP = strip
237 endif
238
239 +OPT_FLAGS = -Os
240 +
241 ifeq ($(INSURE),1)
242 CC = insure
243 endif
244 @@ -61,7 +63,7 @@
245 OBJ_DIR = obj/debug/$(DIR_PATH)
246 UPNP_LIB_DIR = $(LIBS)/debug/$(DIR_PATH)
247 else
248 -CFLAGS += -Os -DNO_DEBUG -DNDEBUG
249 +CFLAGS += $(OPT_FLAGS) -DNO_DEBUG -DNDEBUG
250 OBJ_DIR = obj/$(DIR_PATH)
251 UPNP_LIB_DIR = $(LIBS)/$(DIR_PATH)
252 endif
253 diff -ruN libupnp-1.2.1-orig/upnp/src/ssdp/makefile libupnp-1.2.1-1/upnp/src/ssdp/makefile
254 --- libupnp-1.2.1-orig/upnp/src/ssdp/makefile 2003-01-14 23:06:14.000000000 +0100
255 +++ libupnp-1.2.1-1/upnp/src/ssdp/makefile 2005-05-15 19:36:04.000000000 +0200
256 @@ -44,6 +44,8 @@
257 STRIP = strip
258 endif
259
260 +OPT_FLAGS = -Os
261 +
262 ifeq ($(INSURE),1)
263 CC = insure
264 endif
265 @@ -61,7 +63,7 @@
266 OBJ_DIR = obj/debug/$(DIR_PATH)
267 UPNP_LIB_DIR = $(LIBS)/debug/$(DIR_PATH)
268 else
269 -CFLAGS += -Os -DNO_DEBUG -DNDEBUG
270 +CFLAGS += $(OPT_FLAGS) -DNO_DEBUG -DNDEBUG
271 OBJ_DIR = obj/$(DIR_PATH)
272 UPNP_LIB_DIR = $(LIBS)/$(DIR_PATH)
273 endif
274 diff -ruN libupnp-1.2.1-orig/upnp/src/urlconfig/Makefile libupnp-1.2.1-1/upnp/src/urlconfig/Makefile
275 --- libupnp-1.2.1-orig/upnp/src/urlconfig/Makefile 2003-01-14 23:06:14.000000000 +0100
276 +++ libupnp-1.2.1-1/upnp/src/urlconfig/Makefile 2005-05-15 19:36:30.000000000 +0200
277 @@ -43,6 +43,8 @@
278 STRIP = strip
279 endif
280
281 +OPT_FLAGS = -Os
282 +
283 ifeq ($(INSURE),1)
284 CC = insure
285 endif
286 @@ -60,7 +62,7 @@
287 OBJ_DIR = obj/debug/$(DIR_PATH)
288 UPNP_LIB_DIR = $(LIBS)/debug/$(DIR_PATH)
289 else
290 -CFLAGS += -Os -DNO_DEBUG -DNDEBUG
291 +CFLAGS += $(OPT_FLAGS) -DNO_DEBUG -DNDEBUG
292 OBJ_DIR = obj/$(DIR_PATH)
293 UPNP_LIB_DIR = $(LIBS)/$(DIR_PATH)
294 endif
295 diff -ruN libupnp-1.2.1-orig/upnp/src/uuid/Makefile libupnp-1.2.1-1/upnp/src/uuid/Makefile
296 --- libupnp-1.2.1-orig/upnp/src/uuid/Makefile 2003-01-14 23:06:14.000000000 +0100
297 +++ libupnp-1.2.1-1/upnp/src/uuid/Makefile 2005-05-15 19:36:53.000000000 +0200
298 @@ -44,6 +44,8 @@
299 STRIP = strip
300 endif
301
302 +OPT_FLAGS = -Os
303 +
304 ifeq ($(INSURE),1)
305 CC = insure
306 endif
307 @@ -61,7 +63,7 @@
308 OBJ_DIR = obj/debug/$(DIR_PATH)
309 UPNP_LIB_DIR = $(LIBS)/debug/$(DIR_PATH)
310 else
311 -CFLAGS += -Os -DNO_DEBUG -DNDEBUG
312 +CFLAGS += $(OPT_FLAGS) -DNO_DEBUG -DNDEBUG
313 OBJ_DIR = obj/$(DIR_PATH)
314 UPNP_LIB_DIR = $(LIBS)/$(DIR_PATH)
315 endif