[package] update squid to 2.6STABLE23
[openwrt/svn-archive/archive.git] / net / squid / patches / 005-lib-makefile.patch
1 Index: squid-2.6.STABLE23/lib/Makefile.in
2 ===================================================================
3 --- squid-2.6.STABLE23.orig/lib/Makefile.in 2009-09-17 01:33:17.000000000 +0200
4 +++ squid-2.6.STABLE23/lib/Makefile.in 2009-11-11 14:16:09.000000000 +0100
5 @@ -61,7 +61,9 @@
6 splay.c Stack.c strsep.c stub_memaccount.c util.c uudecode.c \
7 win32lib.c
8 @NEED_OWN_MD5_TRUE@am__objects_1 = md5.$(OBJEXT)
9 +@NEED_OWN_MD5_TRUE@am__host_objects_1 = md5.$(HOST_OBJEXT)
10 @NEED_OWN_SNPRINTF_TRUE@am__objects_2 = snprintf.$(OBJEXT)
11 +@NEED_OWN_SNPRINTF_TRUE@am__host_objects_2 = snprintf.$(HOST_OBJEXT)
12 @NEED_OWN_STRSEP_TRUE@am__objects_3 = strsep.$(OBJEXT)
13 @ENABLE_MINGW32SPECIFIC_TRUE@am__objects_4 = win32lib.$(OBJEXT)
14 am_libmiscutil_a_OBJECTS = Array.$(OBJEXT) base64.$(OBJEXT) \
15 @@ -72,7 +74,19 @@
16 $(am__objects_2) splay.$(OBJEXT) Stack.$(OBJEXT) \
17 $(am__objects_3) stub_memaccount.$(OBJEXT) util.$(OBJEXT) \
18 uudecode.$(OBJEXT) $(am__objects_4)
19 +am_libmiscutil_a_HOST_OBJECTS = Array.$(HOST_OBJEXT) \
20 + base64.$(HOST_OBJEXT) getfullhostname.$(HOST_OBJEXT) \
21 + hash.$(HOST_OBJEXT) heap.$(HOST_OBJEXT) \
22 + html_quote.$(HOST_OBJEXT) iso3307.$(HOST_OBJEXT) \
23 + $(am__host_objects_1) radix.$(HOST_OBJEXT) \
24 + rfc1035.$(HOST_OBJEXT) rfc1123.$(HOST_OBJEXT) \
25 + rfc1738.$(HOST_OBJEXT) rfc2617.$(HOST_OBJEXT) \
26 + safe_inet_addr.$(HOST_OBJEXT) $(am__host_objects_2) \
27 + splay.$(HOST_OBJEXT) Stack.$(HOST_OBJEXT) \
28 + stub_memaccount.$(HOST_OBJEXT) util.$(HOST_OBJEXT) \
29 + uudecode.$(HOST_OBJEXT)
30 libmiscutil_a_OBJECTS = $(am_libmiscutil_a_OBJECTS)
31 +libmiscutil_a_HOST_OBJECTS = $(am_libmiscutil_a_HOST_OBJECTS)
32 libntlmauth_a_AR = $(AR) $(ARFLAGS)
33 libntlmauth_a_DEPENDENCIES = @LIBOBJS@
34 am_libntlmauth_a_OBJECTS = ntlmauth.$(OBJEXT)
35 @@ -90,15 +104,19 @@
36 am__depfiles_maybe = depfiles
37 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
38 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
39 +HOST_COMPILE = $(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
40 + $(AM_CFLAGS)
41 CCLD = $(CC)
42 +HOST_CCLD = ld
43 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
44 -SOURCES = $(libdlmalloc_a_SOURCES) $(libmiscutil_a_SOURCES) \
45 +HOST_LINK = $(HOST_CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
46 +SOURCES = $(libdlmalloc_a_SOURCES) $(libmiscutil_a_SOURCES) $(libmiscutil_a_HOST_SOURCES) \
47 $(EXTRA_libmiscutil_a_SOURCES) $(libntlmauth_a_SOURCES) \
48 $(libregex_a_SOURCES) $(libsspwin32_a_SOURCES)
49 DIST_SOURCES = $(libdlmalloc_a_SOURCES) \
50 $(am__libmiscutil_a_SOURCES_DIST) \
51 $(EXTRA_libmiscutil_a_SOURCES) $(libntlmauth_a_SOURCES) \
52 - $(libregex_a_SOURCES) $(libsspwin32_a_SOURCES)
53 + $(libregex_a_SOURCES) $(libsspwin32_a_SOURCES) $(libmiscutil_a_HOST_SOURCES)
54 ETAGS = etags
55 CTAGS = ctags
56 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
57 @@ -106,6 +124,7 @@
58 ALLOCA = @ALLOCA@
59 AMTAR = @AMTAR@
60 AR = @AR@
61 +HOST_AR = ar
62 AR_R = @AR_R@
63 AUTH_LIBS = @AUTH_LIBS@
64 AUTH_MODULES = @AUTH_MODULES@
65 @@ -118,6 +137,7 @@
66 CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
67 CACHE_ICP_PORT = @CACHE_ICP_PORT@
68 CC = @CC@
69 +HOST_CC = gcc
70 CCDEPMODE = @CCDEPMODE@
71 CFLAGS = @CFLAGS@
72 CGIEXT = @CGIEXT@
73 @@ -165,6 +185,8 @@
74 NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@
75 NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@
76 OBJEXT = @OBJEXT@
77 +HOST_OBJEXT = @OBJEXT@.$(shell uname -m)
78 +HOST_DEPEXT = .$(shell uname -m)
79 OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
80 PACKAGE = @PACKAGE@
81 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
82 @@ -264,6 +286,7 @@
83 noinst_LIBRARIES = \
84 @LIBDLMALLOC@ \
85 libmiscutil.a \
86 + libmiscutil$(shell uname -m).a \
87 libntlmauth.a \
88 @LIBREGEX@ \
89 $(LIBSSPWIN32)
90 @@ -298,9 +321,34 @@
91 uudecode.c \
92 $(WIN32SRC)
93
94 +libmiscutil_a_HOST_SOURCES = \
95 + Array.c \
96 + base64.c \
97 + getfullhostname.c \
98 + hash.c \
99 + heap.c \
100 + html_quote.c \
101 + iso3307.c \
102 + $(MD5SOURCE) \
103 + radix.c \
104 + rfc1035.c \
105 + rfc1123.c \
106 + rfc1738.c \
107 + rfc2617.c \
108 + safe_inet_addr.c \
109 + $(SNPRINTFSOURCE) \
110 + splay.c \
111 + Stack.c \
112 + stub_memaccount.c \
113 + util.c \
114 + uudecode.c
115 +
116 libmiscutil_a_LIBADD = \
117 @LIBOBJS@
118
119 +libmiscutil_a_HOST_LIBADD = \
120 + @LIBOBJS@
121 +
122 # $(top_srcdir)/include/version.h should be a dependency
123 libregex_a_SOURCES = \
124 GNUregex.c
125 @@ -321,7 +369,7 @@
126 all: all-am
127
128 .SUFFIXES:
129 -.SUFFIXES: .c .o .obj
130 +.SUFFIXES: .c .o .obj .o.$(shell uname -m)
131 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
132 @for dep in $?; do \
133 case '$(am__configure_deps)' in \
134 @@ -358,10 +406,13 @@
135 -rm -f libdlmalloc.a
136 $(libdlmalloc_a_AR) libdlmalloc.a $(libdlmalloc_a_OBJECTS) $(libdlmalloc_a_LIBADD)
137 $(RANLIB) libdlmalloc.a
138 -libmiscutil.a: $(libmiscutil_a_OBJECTS) $(libmiscutil_a_DEPENDENCIES)
139 +libmiscutil.a: $(libmiscutil_a_OBJECTS) $(libmiscutil_a_HOST_OBJECTS) $(libmiscutil_a_DEPENDENCIES)
140 -rm -f libmiscutil.a
141 + -rm -f libmiscutil$(shell uname -m).a
142 $(libmiscutil_a_AR) libmiscutil.a $(libmiscutil_a_OBJECTS) $(libmiscutil_a_LIBADD)
143 + ar rcu libmiscutil$(shell uname -m).a $(libmiscutil_a_HOST_OBJECTS) $(libmiscutil_a_HOST_LIBADD)
144 $(RANLIB) libmiscutil.a
145 + ranlib libmiscutil$(shell uname -m).a
146 libntlmauth.a: $(libntlmauth_a_OBJECTS) $(libntlmauth_a_DEPENDENCIES)
147 -rm -f libntlmauth.a
148 $(libntlmauth_a_AR) libntlmauth.a $(libntlmauth_a_OBJECTS) $(libntlmauth_a_LIBADD)
149 @@ -412,6 +463,21 @@
150 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
151 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uudecode.Po@am__quote@
152 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32lib.Po@am__quote@
153 +@AMDEP_TRUE@DEP_HOST_FILES = $(DEPDIR)/Array.Po.$(HOST_DEPEXT) $(DEPDIR)/GNUregex.Po.$(HOST_DEPEXT) \
154 +@AMDEP_TRUE@ $(DEPDIR)/Stack.Po.$(HOST_DEPEXT) $(DEPDIR)/base64.Po.$(HOST_DEPEXT) \
155 +@AMDEP_TRUE@ $(DEPDIR)/dlmalloc.Po.$(HOST_DEPEXT) $(DEPDIR)/drand48.Po.$(HOST_DEPEXT) \
156 +@AMDEP_TRUE@ $(DEPDIR)/getfullhostname.Po.$(HOST_DEPEXT) $(DEPDIR)/hash.Po.$(HOST_DEPEXT) \
157 +@AMDEP_TRUE@ $(DEPDIR)/heap.Po.$(HOST_DEPEXT) $(DEPDIR)/html_quote.Po.$(HOST_DEPEXT) \
158 +@AMDEP_TRUE@ $(DEPDIR)/inet_ntoa.Po.$(HOST_DEPEXT) $(DEPDIR)/initgroups.Po.$(HOST_DEPEXT) \
159 +@AMDEP_TRUE@ $(DEPDIR)/iso3307.Po.$(HOST_DEPEXT) $(DEPDIR)/md5.Po.$(HOST_DEPEXT) \
160 +@AMDEP_TRUE@ $(DEPDIR)/ntlmauth.Po.$(HOST_DEPEXT) $(DEPDIR)/radix.Po.$(HOST_DEPEXT) \
161 +@AMDEP_TRUE@ $(DEPDIR)/rfc1035.Po.$(HOST_DEPEXT) $(DEPDIR)/rfc1123.Po.$(HOST_DEPEXT) \
162 +@AMDEP_TRUE@ $(DEPDIR)/rfc1738.Po.$(HOST_DEPEXT) $(DEPDIR)/rfc2617.Po.$(HOST_DEPEXT) \
163 +@AMDEP_TRUE@ $(DEPDIR)/safe_inet_addr.Po.$(HOST_DEPEXT) $(DEPDIR)/snprintf.Po.$(HOST_DEPEXT) \
164 +@AMDEP_TRUE@ $(DEPDIR)/splay.Po.$(HOST_DEPEXT) $(DEPDIR)/strerror.Po.$(HOST_DEPEXT) \
165 +@AMDEP_TRUE@ $(DEPDIR)/stub_memaccount.Po.$(HOST_DEPEXT) $(DEPDIR)/tempnam.Po.$(HOST_DEPEXT) \
166 +@AMDEP_TRUE@ $(DEPDIR)/util.Po.$(HOST_DEPEXT) $(DEPDIR)/uudecode.Po.$(HOST_DEPEXT)
167 +
168
169 .c.o:
170 @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
171 @@ -420,6 +486,9 @@
172 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
173 @am__fastdepCC_FALSE@ $(COMPILE) -c $<
174
175 +.c.o.$(shell uname -m):
176 + $(HOST_COMPILE) -o $(shell basename $< .c).o.$(shell uname -m) -c $<
177 +
178 .c.obj:
179 @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
180 @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po