X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=net%2Fsquid%2Fpatches%2F001-cross_compile.patch;h=fb09b36c6a304fa22161b603a7b52f599b65ec48;hp=fd8f9b0e73991e498dcb74ddd80ac72e628b06e8;hb=dbd0b91e622c59ef7e827ca63888c9e448267c21;hpb=d11d8cc49db4aff5e616014d21a4fe3def89f041 diff --git a/net/squid/patches/001-cross_compile.patch b/net/squid/patches/001-cross_compile.patch index fd8f9b0e73..fb09b36c6a 100644 --- a/net/squid/patches/001-cross_compile.patch +++ b/net/squid/patches/001-cross_compile.patch @@ -1,215 +1,3 @@ -diff -urN squid-2.5.STABLE13/configure squid-2.5.STABLE13.new/configure ---- squid-2.5.STABLE13/configure 2006-03-12 12:29:22.000000000 +0100 -+++ squid-2.5.STABLE13.new/configure 2006-04-15 10:30:10.000000000 +0200 -@@ -2441,10 +2441,6 @@ - if test -z "$SSLLIB"; then - SSLLIB="-lcrypto" # for MD5 routines - fi -- if $PKGCONFIG --exists openssl; then -- SSLLIB="`$PKGCONFIG --libs openssl`" -- SSLFLAGS="`$PKGCONFIG --cflags openssl`" -- fi - CPPFLAGS="${SSLFLAGS} $CPPFLAGS" - fi - -diff -urN squid-2.5.STABLE13/include/autoconf.h.in squid-2.5.STABLE13.new/include/autoconf.h.in ---- squid-2.5.STABLE13/include/autoconf.h.in 2005-09-13 02:12:34.000000000 +0200 -+++ squid-2.5.STABLE13.new/include/autoconf.h.in 2006-04-15 10:29:39.000000000 +0200 -@@ -729,10 +729,10 @@ - #undef HAVE_OPENSSL_ERR_H - - /* Define if you have the header file. */ --#undef HAVE_OPENSSL_MD5_H -+#define HAVE_OPENSSL_MD5_H 1 - - /* Define if you have the header file. */ --#undef HAVE_OPENSSL_SSL_H -+#define HAVE_OPENSSL_SSL_H 1 - - /* Define if you have the header file. */ - #undef HAVE_POLL_H -diff -urN squid-2.5.STABLE13/lib/Makefile.in squid-2.5.STABLE13.new/lib/Makefile.in ---- squid-2.5.STABLE13/lib/Makefile.in 2005-09-28 22:57:20.000000000 +0200 -+++ squid-2.5.STABLE13.new/lib/Makefile.in 2006-04-15 10:29:39.000000000 +0200 -@@ -63,6 +63,7 @@ - host_triplet = @host@ - AMTAR = @AMTAR@ - AR = @AR@ -+HOST_AR = ar - AR_R = @AR_R@ - AUTH_LIBS = @AUTH_LIBS@ - AUTH_MODULES = @AUTH_MODULES@ -@@ -72,6 +73,7 @@ - CACHE_HTTP_PORT = @CACHE_HTTP_PORT@ - CACHE_ICP_PORT = @CACHE_ICP_PORT@ - CC = @CC@ -+HOST_CC = gcc - CGIEXT = @CGIEXT@ - CPP = @CPP@ - CRYPTLIB = @CRYPTLIB@ -@@ -95,6 +97,8 @@ - MV = @MV@ - NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ - OBJEXT = @OBJEXT@ -+HOST_OBJEXT = @OBJEXT@.$(shell uname -m) -+HOST_DEPEXT = .$(shell uname -m) - PACKAGE = @PACKAGE@ - PERL = @PERL@ - PKGCONFIG = @PKGCONFIG@ -@@ -133,6 +137,7 @@ - noinst_LIBRARIES = \ - @LIBDLMALLOC@ \ - libmiscutil.a \ -+ libmiscutil$(shell uname -m).a \ - libntlmauth.a \ - @LIBREGEX@ - -@@ -162,9 +167,34 @@ - util.c \ - uudecode.c - -+libmiscutil_a_HOST_SOURCES = \ -+ Array.c \ -+ base64.c \ -+ getfullhostname.c \ -+ hash.c \ -+ heap.c \ -+ html_quote.c \ -+ iso3307.c \ -+ $(MD5SOURCE) \ -+ radix.c \ -+ rfc1035.c \ -+ rfc1123.c \ -+ rfc1738.c \ -+ rfc2617.c \ -+ safe_inet_addr.c \ -+ $(SNPRINTFSOURCE) \ -+ splay.c \ -+ Stack.c \ -+ stub_memaccount.c \ -+ util.c \ -+ uudecode.c -+ - libmiscutil_a_LIBADD = \ - @LIBOBJS@ - -+libmiscutil_a_HOST_LIBADD = \ -+ @LIBOBJS@ -+ - # $(top_srcdir)/include/version.h should be a dependency - libregex_a_SOURCES = \ - GNUregex.c -@@ -193,9 +223,11 @@ - libmiscutil_a_AR = $(AR) cru - libmiscutil_a_DEPENDENCIES = @LIBOBJS@ - @NEED_OWN_MD5_TRUE@am__objects_1 = md5.$(OBJEXT) -+@NEED_OWN_MD5_TRUE@am__host_objects_1 = md5.$(HOST_OBJEXT) - @NEED_OWN_MD5_FALSE@am__objects_1 = - @NEED_OWN_SNPRINTF_FALSE@am__objects_2 = - @NEED_OWN_SNPRINTF_TRUE@am__objects_2 = snprintf.$(OBJEXT) -+@NEED_OWN_SNPRINTF_TRUE@am__host_objects_2 = snprintf.$(HOST_OBJEXT) - am_libmiscutil_a_OBJECTS = Array.$(OBJEXT) base64.$(OBJEXT) \ - getfullhostname.$(OBJEXT) hash.$(OBJEXT) heap.$(OBJEXT) \ - html_quote.$(OBJEXT) iso3307.$(OBJEXT) $(am__objects_1) \ -@@ -203,7 +235,19 @@ - rfc1738.$(OBJEXT) rfc2617.$(OBJEXT) safe_inet_addr.$(OBJEXT) \ - $(am__objects_2) splay.$(OBJEXT) Stack.$(OBJEXT) \ - stub_memaccount.$(OBJEXT) util.$(OBJEXT) uudecode.$(OBJEXT) -+am_libmiscutil_a_HOST_OBJECTS = Array.$(HOST_OBJEXT) \ -+ base64.$(HOST_OBJEXT) getfullhostname.$(HOST_OBJEXT) \ -+ hash.$(HOST_OBJEXT) heap.$(HOST_OBJEXT) \ -+ html_quote.$(HOST_OBJEXT) iso3307.$(HOST_OBJEXT) \ -+ $(am__host_objects_1) radix.$(HOST_OBJEXT) \ -+ rfc1035.$(HOST_OBJEXT) rfc1123.$(HOST_OBJEXT) \ -+ rfc1738.$(HOST_OBJEXT) rfc2617.$(HOST_OBJEXT) \ -+ safe_inet_addr.$(HOST_OBJEXT) $(am__host_objects_2) \ -+ splay.$(HOST_OBJEXT) Stack.$(HOST_OBJEXT) \ -+ stub_memaccount.$(HOST_OBJEXT) util.$(HOST_OBJEXT) \ -+ uudecode.$(HOST_OBJEXT) - libmiscutil_a_OBJECTS = $(am_libmiscutil_a_OBJECTS) -+libmiscutil_a_HOST_OBJECTS = $(am_libmiscutil_a_HOST_OBJECTS) - libntlmauth_a_AR = $(AR) cru - libntlmauth_a_DEPENDENCIES = @LIBOBJS@ - am_libntlmauth_a_OBJECTS = ntlmauth.$(OBJEXT) -@@ -233,22 +277,42 @@ - @AMDEP_TRUE@ $(DEPDIR)/splay.Po $(DEPDIR)/strerror.Po \ - @AMDEP_TRUE@ $(DEPDIR)/stub_memaccount.Po $(DEPDIR)/tempnam.Po \ - @AMDEP_TRUE@ $(DEPDIR)/util.Po $(DEPDIR)/uudecode.Po -+@AMDEP_TRUE@DEP_HOST_FILES = $(DEPDIR)/Array.Po.$(HOST_DEPEXT) $(DEPDIR)/GNUregex.Po.$(HOST_DEPEXT) \ -+@AMDEP_TRUE@ $(DEPDIR)/Stack.Po.$(HOST_DEPEXT) $(DEPDIR)/base64.Po.$(HOST_DEPEXT) \ -+@AMDEP_TRUE@ $(DEPDIR)/dlmalloc.Po.$(HOST_DEPEXT) $(DEPDIR)/drand48.Po.$(HOST_DEPEXT) \ -+@AMDEP_TRUE@ $(DEPDIR)/getfullhostname.Po.$(HOST_DEPEXT) $(DEPDIR)/hash.Po.$(HOST_DEPEXT) \ -+@AMDEP_TRUE@ $(DEPDIR)/heap.Po.$(HOST_DEPEXT) $(DEPDIR)/html_quote.Po.$(HOST_DEPEXT) \ -+@AMDEP_TRUE@ $(DEPDIR)/inet_ntoa.Po.$(HOST_DEPEXT) $(DEPDIR)/initgroups.Po.$(HOST_DEPEXT) \ -+@AMDEP_TRUE@ $(DEPDIR)/iso3307.Po.$(HOST_DEPEXT) $(DEPDIR)/md5.Po.$(HOST_DEPEXT) \ -+@AMDEP_TRUE@ $(DEPDIR)/ntlmauth.Po.$(HOST_DEPEXT) $(DEPDIR)/radix.Po.$(HOST_DEPEXT) \ -+@AMDEP_TRUE@ $(DEPDIR)/rfc1035.Po.$(HOST_DEPEXT) $(DEPDIR)/rfc1123.Po.$(HOST_DEPEXT) \ -+@AMDEP_TRUE@ $(DEPDIR)/rfc1738.Po.$(HOST_DEPEXT) $(DEPDIR)/rfc2617.Po.$(HOST_DEPEXT) \ -+@AMDEP_TRUE@ $(DEPDIR)/safe_inet_addr.Po.$(HOST_DEPEXT) $(DEPDIR)/snprintf.Po.$(HOST_DEPEXT) \ -+@AMDEP_TRUE@ $(DEPDIR)/splay.Po.$(HOST_DEPEXT) $(DEPDIR)/strerror.Po.$(HOST_DEPEXT) \ -+@AMDEP_TRUE@ $(DEPDIR)/stub_memaccount.Po.$(HOST_DEPEXT) $(DEPDIR)/tempnam.Po.$(HOST_DEPEXT) \ -+@AMDEP_TRUE@ $(DEPDIR)/util.Po.$(HOST_DEPEXT) $(DEPDIR)/uudecode.Po.$(HOST_DEPEXT) -+ -+ - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+HOST_COMPILE = $(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(AM_CFLAGS) - CCLD = $(CC) -+HOST_CCLD = ld - LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+HOST_LINK = $(HOST_CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CFLAGS = @CFLAGS@ - DIST_SOURCES = $(libdlmalloc_a_SOURCES) $(libmiscutil_a_SOURCES) \ - $(EXTRA_libmiscutil_a_SOURCES) $(libntlmauth_a_SOURCES) \ -- $(libregex_a_SOURCES) -+ $(libregex_a_SOURCES) $(libmiscutil_a_HOST_SOURCES) - DIST_COMMON = Makefile.am Makefile.in drand48.c inet_ntoa.c \ - initgroups.c strerror.c tempnam.c --SOURCES = $(libdlmalloc_a_SOURCES) $(libmiscutil_a_SOURCES) $(EXTRA_libmiscutil_a_SOURCES) $(libntlmauth_a_SOURCES) $(libregex_a_SOURCES) -+SOURCES = $(libdlmalloc_a_SOURCES) $(libmiscutil_a_SOURCES) $(libmiscutil_a_HOST_SOURCES) $(EXTRA_libmiscutil_a_SOURCES) $(libntlmauth_a_SOURCES) $(libregex_a_SOURCES) - - all: all-am - - .SUFFIXES: --.SUFFIXES: .c .o .obj -+.SUFFIXES: .c .o .obj .o.$(shell uname -m) - $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign lib/Makefile -@@ -265,10 +329,13 @@ - -rm -f libdlmalloc.a - $(libdlmalloc_a_AR) libdlmalloc.a $(libdlmalloc_a_OBJECTS) $(libdlmalloc_a_LIBADD) - $(RANLIB) libdlmalloc.a --libmiscutil.a: $(libmiscutil_a_OBJECTS) $(libmiscutil_a_DEPENDENCIES) -+libmiscutil.a: $(libmiscutil_a_OBJECTS) $(libmiscutil_a_HOST_OBJECTS) $(libmiscutil_a_DEPENDENCIES) - -rm -f libmiscutil.a -+ -rm -f libmiscutil$(shell uname -m).a - $(libmiscutil_a_AR) libmiscutil.a $(libmiscutil_a_OBJECTS) $(libmiscutil_a_LIBADD) -+ ar rcu libmiscutil$(shell uname -m).a $(libmiscutil_a_HOST_OBJECTS) $(libmiscutil_a_HOST_LIBADD) - $(RANLIB) libmiscutil.a -+ ranlib libmiscutil$(shell uname -m).a - libntlmauth.a: $(libntlmauth_a_OBJECTS) $(libntlmauth_a_DEPENDENCIES) - -rm -f libntlmauth.a - $(libntlmauth_a_AR) libntlmauth.a $(libntlmauth_a_OBJECTS) $(libntlmauth_a_LIBADD) -@@ -313,6 +380,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/util.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/uudecode.Po@am__quote@ - -+ - distclean-depend: - -rm -rf $(DEPDIR) - -@@ -321,7 +389,8 @@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< -- -+.c.o.$(shell uname -m): -+ $(HOST_COMPILE) -o $(shell basename $< .c).o.$(shell uname -m) -c $< - .c.obj: - @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ diff -urN squid-2.5.STABLE13/src/ctype.c squid-2.5.STABLE13.new/src/ctype.c --- squid-2.5.STABLE13/src/ctype.c 1970-01-01 01:00:00.000000000 +0100 +++ squid-2.5.STABLE13.new/src/ctype.c 2006-04-15 10:29:39.000000000 +0200 @@ -769,7 +557,7 @@ diff -urN squid-2.5.STABLE13/src/Makefile.in squid-2.5.STABLE13.new/src/Makefile cf_parser.h: cf.data cf_gen$(EXEEXT) + rm -f cf_gen + gcc -c ctype.c -+ gcc -o cf_gen cf_gen.c -I./ -I../ -I../include/ -L../lib -lmiscutil$(shell uname -m) -lm -lnsl -Wl,ctype.o ++ gcc -o cf_gen cf_gen.c -DNODEBUG=1 -I./ -I../ -I../include/ -L../lib -lmiscutil$(shell uname -m) -lm -lnsl -Wl,ctype.o ./cf_gen cf.data cf_gen_defines.h: $(srcdir)/cf_gen_defines $(srcdir)/cf.data.pre