net/squid/patches/005-lib-makefile.patch

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