From: Florian Fainelli <florian@openwrt.org>
Date: Sat, 8 Mar 2014 00:57:04 +0000 (+0000)
Subject: mdnsresponder: ensure dns-sd is linked with the right options
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=3635dacee6a8d63cff16257999d32cdf668092b4;p=openwrt%2Fsvn-archive%2Fpackages.git

mdnsresponder: ensure dns-sd is linked with the right options

Some toolchains (e.g: ARM with VFP) require us to specify the ABI to use,
update the dns-sd linking command-line for this.

Signed-off-by: Florian Fainelli <florian@openwrt.org>

SVN-Revision: 39811
---

diff --git a/net/mdnsresponder/Makefile b/net/mdnsresponder/Makefile
index 1a3d8e68a..331308e97 100644
--- a/net/mdnsresponder/Makefile
+++ b/net/mdnsresponder/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009-2011 OpenWrt.org
+# Copyright (C) 2009-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mDNSResponder
 PKG_VERSION:=544
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=mDNSResponder-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://opensource.apple.com/tarballs/mDNSResponder/
diff --git a/net/mdnsresponder/patches/001-cross_compile.patch b/net/mdnsresponder/patches/001-cross_compile.patch
index e5f4ae511..f824d5e26 100644
--- a/net/mdnsresponder/patches/001-cross_compile.patch
+++ b/net/mdnsresponder/patches/001-cross_compile.patch
@@ -14,11 +14,11 @@
  
  build/dns-sd: build dns-sd.c ClientCommon.c
 -	cc $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -Wall -o $@
-+	$(CC) $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -Wall -o $@
++	$(CC) $(CFLAGS) $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -Wall -o $@
  
  build/dns-sd64: build dns-sd.c ClientCommon.c
 -	cc $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -Wall -o $@ -m64
-+	$(CC) $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -Wall -o $@ -m64
++	$(CC) $(CFLAGS) $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -Wall -o $@ -m64
  
  # Note, we can make a 'fat' version of dns-sd using 'lipo', as shown below, but we
  # don't, because we don't want or need a 'fat' version of dns-sd, because it will
@@ -56,7 +56,7 @@
  LINKOPTS = -lsocket -lnsl -lresolv
  JAVACFLAGS_OS += -I$(JDK)/include/solaris
  ifneq ($(DEBUG),1)
-@@ -147,7 +148,8 @@ CFLAGS_OS = -DHAVE_IPV6 -no-cpp-precomp
+@@ -147,7 +148,8 @@ CFLAGS_OS = -DHAVE_IPV6 -no-cpp-precomp 
  	-D__MAC_OS_X_VERSION_MIN_REQUIRED=__MAC_OS_X_VERSION_10_4 \
  	-D__APPLE_USE_RFC_2292 #-Wunreachable-code
  CC = gcc
diff --git a/net/mdnsresponder/patches/100-Binding-IPv6-sockets-to-interface-due-to-link-local.patch b/net/mdnsresponder/patches/100-Binding-IPv6-sockets-to-interface-due-to-link-local.patch
index 9ae462099..639a186fb 100644
--- a/net/mdnsresponder/patches/100-Binding-IPv6-sockets-to-interface-due-to-link-local.patch
+++ b/net/mdnsresponder/patches/100-Binding-IPv6-sockets-to-interface-due-to-link-local.patch
@@ -11,9 +11,6 @@ places and mdnsd is quite confused.
  1 file changed, 22 insertions(+)
  create mode 100644 net/mdnsresponder/patches/003-ipv6-bind-to-interface.patch
 
-diff --git a/net/mdnsresponder/patches/003-ipv6-bind-to-interface.patch b/net/mdnsresponder/patches/003-ipv6-bind-to-interface.patch
-new file mode 100644
-index 0000000..c65221e
 --- /dev/null
 +++ b/net/mdnsresponder/patches/003-ipv6-bind-to-interface.patch
 @@ -0,0 +1,22 @@
@@ -39,6 +36,3 @@ index 0000000..c65221e
 +         if (err == 0)
 +         {
 +Only in mDNSResponder-544/mDNSPosix: mDNSPosix.c~
--- 
-1.7.9.5
-