70 lines
2.4 KiB
Text
70 lines
2.4 KiB
Text
$NetBSD: patch-aa,v 1.13 2014/05/12 15:06:56 ryoon Exp $
|
||
|
||
Find libpthread.so when not on the default rpath.
|
||
Allow custom CC and CFLAGS.
|
||
Disable -Werror on OSX.
|
||
Fix build failure under OpenBSD, __guard_local issue.
|
||
|
||
--- mDNSPosix/Makefile.orig 2009-08-11 01:13:47.000000000 +0000
|
||
+++ mDNSPosix/Makefile
|
||
@@ -54,7 +54,6 @@ COREDIR = ../mDNSCore
|
||
SHAREDDIR ?= ../mDNSShared
|
||
JDK = /usr/jdk
|
||
|
||
-CC = @cc
|
||
BISON = @bison
|
||
FLEX = @flex
|
||
LD = ld -shared
|
||
@@ -64,7 +63,7 @@ LN = ln -s -f
|
||
CFLAGS_COMMON = -I$(COREDIR) -I$(SHAREDDIR) -I$(OBJDIR) -fwrapv -W -Wall -DPID_FILE=\"/var/run/mdnsd.pid\" -DMDNS_UDS_SERVERPATH=\"/var/run/mdnsd\"
|
||
CFLAGS_PTHREAD =
|
||
LINKOPTS =
|
||
-LINKOPTS_PTHREAD = -lpthread
|
||
+LINKOPTS_PTHREAD = $(LIBFLAGS) ${COMPILER_RPATH_FLAG}${PTHREADBASE}/lib ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} ${EXTRA_LIBS}
|
||
LDSUFFIX = so
|
||
JAVACFLAGS_OS = -fPIC -shared -ldns_sd
|
||
|
||
@@ -100,7 +99,7 @@ endif
|
||
else
|
||
|
||
ifeq ($(os),linux)
|
||
-CFLAGS_OS = -DNOT_HAVE_SA_LEN -DUSES_NETLINK -DHAVE_LINUX -DTARGET_OS_LINUX
|
||
+CFLAGS_OS = -DNOT_HAVE_SA_LEN -DUSES_NETLINK -DHAVE_LINUX -DTARGET_OS_LINUX -D_GNU_SOURCE
|
||
FLEXFLAGS_OS = -l
|
||
JAVACFLAGS_OS += -I$(JDK)/include/linux
|
||
OPTIONALTARG = nss_mdns
|
||
@@ -126,7 +125,7 @@ CFLAGS_OS =
|
||
# -pthread
|
||
# Link a user-threaded process against libc_r instead of libc.
|
||
CFLAGS_PTHREAD = -pthread -D_THREAD_SAFE
|
||
-LINKOPTS_PTHREAD = -pthread
|
||
+LINKOPTS_PTHREAD = $(LIBFLAGS) ${COMPILER_RPATH_FLAG}${PTHREADBASE}/lib ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} ${EXTRA_LIBS}
|
||
JAVACFLAGS_OS += -I$(JDK)/include/freebsd
|
||
LDCONFIG = ldconfig
|
||
else
|
||
@@ -134,14 +133,14 @@ else
|
||
ifeq ($(os),openbsd)
|
||
CFLAGS_OS = -DHAVE_BROKEN_RECVDSTADDR
|
||
LDCONFIG = ldconfig
|
||
+LD = cc -shared
|
||
else
|
||
|
||
ifeq ($(os),x)
|
||
# We have to define __MAC_OS_X_VERSION_MIN_REQUIRED=__MAC_OS_X_VERSION_10_4 or on Leopard
|
||
# we get build failures: ‘daemon’ is deprecated (declared at /usr/include/stdlib.h:283)
|
||
-CFLAGS_OS = -DHAVE_IPV6 -no-cpp-precomp -Werror -Wdeclaration-after-statement \
|
||
+CFLAGS_OS = -DHAVE_IPV6 -no-cpp-precomp -Wdeclaration-after-statement \
|
||
-D__MAC_OS_X_VERSION_MIN_REQUIRED=__MAC_OS_X_VERSION_10_4 #-Wunreachable-code
|
||
-CC = @gcc-4.0
|
||
LD = $(CC) -dynamiclib
|
||
LINKOPTS = -lSystem
|
||
LDSUFFIX = dylib
|
||
@@ -205,7 +204,7 @@ endif
|
||
endif
|
||
endif
|
||
|
||
-CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_OS) $(CFLAGS_DEBUG)
|
||
+CFLAGS += $(CFLAGS_COMMON) $(CFLAGS_OS) -DMDNS_DEBUGMSGS=0
|
||
|
||
#############################################################################
|
||
|