net/mdnsresponder/patches/001-cross_compile.patch

   1 diff -u --recursive mDNSResponder-214.3.2-vanilla/Clients/Makefile mDNSResponder-214.3.2/Clients/Makefile
   2 --- mDNSResponder-214.3.2-vanilla/Clients/Makefile      2010-10-15 08:38:44.817282399 -0500
   3 +++ mDNSResponder-214.3.2/Clients/Makefile      2010-10-15 08:40:09.696672081 -0500
   4 @@ -62,6 +62,8 @@
   5
   6  #############################################################################
   7
   8 +CC = @cc
   9 +
  10  # On OS X the dns_sd library functions are included in libSystem, which is implicitly linked with every executable
  11  # If /usr/lib/libSystem.dylib exists, then we're on OS X, so we don't need also to link the "dns_sd" shared library
  12  ifneq "$(wildcard /usr/lib/libSystem.dylib)" ""
  13 @@ -81,10 +83,10 @@
  14         mkdir build
  15
  16  build/dns-sd: build dns-sd.c ClientCommon.c
  17 -       cc $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -Wall -o $@
  18 +       $(CC) $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -Wall -o $@
  19
  20  build/dns-sd64: build dns-sd.c ClientCommon.c
  21 -       cc $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -Wall -o $@ -m64
  22 +       $(CC) $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -Wall -o $@ -m64
  23
  24  # Note, we can make a 'fat' version of dns-sd using 'lipo', as shown below, but we
  25  # don't, because we don't want or need a 'fat' version of dns-sd, because it will
  26 diff -u --recursive mDNSResponder-214.3.2-vanilla/mDNSPosix/Makefile mDNSResponder-214.3.2/mDNSPosix/Makefile
  27 --- mDNSResponder-214.3.2-vanilla/mDNSPosix/Makefile    2010-10-15 08:38:44.798283212 -0500
  28 +++ mDNSResponder-214.3.2/mDNSPosix/Makefile    2010-10-15 08:46:28.739548087 -0500
  29 @@ -316,10 +316,11 @@
  30  SHAREDDIR ?= ../mDNSShared
  31  JDK = /usr/jdk
  32
  33 -CC = @cc
  34 +CC = @gcc
  35  BISON = @bison
  36  FLEX = @flex
  37 -LD = ld -shared
  38 +LD = @ld
  39 +SOOPTS = -shared
  40  CP = cp
  41  RM = rm
  42  LN = ln -s -f
  43 @@ -344,7 +345,7 @@
  44  CFLAGS_DEBUG = -Os -DMDNS_DEBUGMSGS=0
  45  OBJDIR ?= objects/prod
  46  BUILDDIR ?= build/prod
  47 -STRIP = strip -S
  48 +STRIP = @strip -S
  49  endif
  50
  51  # Configure per-OS peculiarities
  52 @@ -353,7 +354,7 @@
  53  CFLAGS_OS = -DNOT_HAVE_DAEMON -DNOT_HAVE_SA_LEN -DNOT_HAVE_SOCKLEN_T -DNOT_HAVE_IF_NAMETOINDEX \
  54          -DLOG_PERROR=0 -D_XPG4_2 -D__EXTENSIONS__ -DHAVE_BROKEN_RECVIF_NAME -DTARGET_OS_SOLARIS
  55  CC = gcc
  56 -LD = gcc -shared
  57 +LD = gcc
  58  LINKOPTS = -lsocket -lnsl -lresolv
  59  JAVACFLAGS_OS += -I$(JDK)/include/solaris
  60  ifneq ($(DEBUG),1)
  61 @@ -404,7 +405,8 @@
  62  CFLAGS_OS = -DHAVE_IPV6 -no-cpp-precomp -Werror -Wdeclaration-after-statement \
  63         -D__MAC_OS_X_VERSION_MIN_REQUIRED=__MAC_OS_X_VERSION_10_4 #-Wunreachable-code
  64  CC = @gcc-4.0
  65 -LD = $(CC) -dynamiclib
  66 +LD = $(CC)
  67 +SOOPTS = -dynamiclib
  68  LINKOPTS = -lSystem
  69  LDSUFFIX = dylib
  70  JDK = /System/Library/Frameworks/JavaVM.framework/Home
  71 @@ -426,8 +428,9 @@
  72  NSSLINKNAME := $(NSSLIBNAME).so.2
  73  NSSINSTPATH := /lib
  74
  75 -# If not otherwise defined, we install into /usr/lib and /usr/include
  76 +# If not otherwise defined, we install into /usr/lib, /usr/include and /etc
  77  # and our startup script is called mdns (e.g. /etc/init.d/mdns)
  78 +ETCBASE?=/etc
  79  INSTBASE?=/usr
  80  STARTUPSCRIPTNAME?=mdns
  81
  82 @@ -511,7 +514,7 @@
  83  CLIENTLIBOBJS = $(OBJDIR)/dnssd_clientlib.c.so.o $(OBJDIR)/dnssd_clientstub.c.so.o $(OBJDIR)/dnssd_ipc.c.so.o
  84
  85  $(BUILDDIR)/libdns_sd.$(LDSUFFIX): $(CLIENTLIBOBJS)
  86 -       @$(LD) $(LINKOPTS) -o $@ $+
  87 +       @$(LD) $(SOOPTS) $(LINKOPTS) -o $@ $+
  88         @$(STRIP) $@
  89
  90  Clients: setup libdns_sd ../Clients/build/dns-sd
  91 @@ -546,7 +549,7 @@
  92  InstalledClients: $(INSTBASE)/bin/dns-sd
  93         @echo $+ " installed"
  94
  95 -InstalledNSS: $(NSSINSTPATH)/$(NSSLINKNAME) /etc/nss_mdns.conf $(MANPATH)/man5/nss_mdns.conf.5 $(MANPATH)/man8/libnss_mdns.8
  96 +InstalledNSS: $(NSSINSTPATH)/$(NSSLINKNAME) $(ETCBASE)/nss_mdns.conf $(MANPATH)/man5/nss_mdns.conf.5 $(MANPATH)/man8/libnss_mdns.8
  97         @echo $+ " installed"
  98
  99  # Note: If daemon already installed, we make sure it's stopped before overwriting it
 100 @@ -601,19 +604,21 @@
 101
 102  $(NSSINSTPATH)/$(NSSLINKNAME): $(NSSINSTPATH)/$(NSSLIBFILE)
 103         $(LN) $< $@
 104 -       ldconfig
 105 +ifdef LDCONFIG
 106 +       $(LDCONFIG)
 107 +endif
 108
 109  $(NSSINSTPATH)/$(NSSLIBFILE): $(BUILDDIR)/$(NSSLIBFILE)
 110         $(CP) $< $@
 111         chmod 444 $@
 112
 113 -/etc/nss_mdns.conf: nss_mdns.conf
 114 +$(ETCBASE)/nss_mdns.conf: nss_mdns.conf
 115         $(CP) $< $@
 116         chmod 444 $@
 117         # Check the nsswitch.conf file.
 118         # If 'mdns' does not already appear on the "hosts:" line, then add it right before 'dns'
 119 -       cp -f /etc/nsswitch.conf /etc/nsswitch.conf.pre-mdns
 120 -       sed -e '/mdns/!s/^\(hosts:.*\)dns\(.*\)/\1mdns dns\2/' /etc/nsswitch.conf.pre-mdns > /etc/nsswitch.conf
 121 +       -[ -f $(ETCBASE)/nsswitch.conf ] && cp -f $(ETCBASE)/nsswitch.conf $(ETCBASE)/nsswitch.conf.pre-mdns
 122 +       -[ -f $(ETCBASE)/nsswitch.conf ] && sed -e '/mdns/!s/^\(hosts:.*\)dns\(.*\)/\1mdns dns\2/' $(ETCBASE)/nsswitch.conf.pre-mdns > $(ETCBASE)/nsswitch.conf
 123
 124  #############################################################################
 125