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

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