From 22316f200803225f2d375ae5c36ffead59e2f6b8 Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Mon, 5 Dec 2022 15:14:26 +0000 Subject: [PATCH 4/6] make: Separate TLS targets from libraries There are dependencies on TLSOBJS, which fails when `-lmbedtls` is listed as a dependency, so separate it out. Upstream-Status: Pending Signed-off-by: Alex Kiernan --- mDNSPosix/Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) Index: mDNSResponder/mDNSPosix/Makefile =================================================================== --- mDNSResponder.orig/mDNSPosix/Makefile +++ mDNSResponder/mDNSPosix/Makefile @@ -112,9 +112,11 @@ ifeq ($(findstring linux,$(os)),linux) ifeq ($(tls), no) CFLAGS_OS = -D_GNU_SOURCE -DHAVE_IPV6 -DNOT_HAVE_SA_LEN -DUSES_NETLINK -DHAVE_LINUX -DTARGET_OS_LINUX -ftabstop=4 -Wno-expansion-to-defined TLSOBJS = +TLSLIBS = else CFLAGS_OS = -D_GNU_SOURCE -DHAVE_IPV6 -DNOT_HAVE_SA_LEN -DUSES_NETLINK -DHAVE_LINUX -DTARGET_OS_LINUX -DPOSIX_HAS_TLS -ftabstop=4 -Wno-expansion-to-defined -TLSOBJS = $(OBJDIR)/mbedtls.c.o -lmbedtls -lmbedcrypto +TLSOBJS = $(OBJDIR)/mbedtls.c.o +TLSLIBS = -lmbedtls -lmbedcrypto endif LD = $(CC) SOOPTS = -shared @@ -266,7 +268,7 @@ Daemon: setup $(BUILDDIR)/mdnsd @echo "Responder daemon done" $(BUILDDIR)/mdnsd: $(DAEMONOBJS) - $(CC) -o $@ $+ $(LINKOPTS) + $(CC) -o $@ $+ $(LINKOPTS) $(TLSLIBS) $(STRIP) $@ # libdns_sd target builds the client library @@ -485,16 +487,16 @@ dnsextd: setup $(BUILDDIR)/dnsextd @echo "dnsextd done" $(BUILDDIR)/mDNSClientPosix: $(APPOBJ) $(TLSOBJS) $(OBJDIR)/Client.c.o - $(CC) $+ -o $@ $(LINKOPTS) + $(CC) $+ -o $@ $(LINKOPTS) $(TLSLIBS) $(BUILDDIR)/mDNSResponderPosix: $(COMMONOBJ) $(TLSOBJS) $(OBJDIR)/Responder.c.o - $(CC) $+ -o $@ $(LINKOPTS) + $(CC) $+ -o $@ $(LINKOPTS) $(TLSLIBS) $(BUILDDIR)/mDNSProxyResponderPosix: $(COMMONOBJ) $(TLSOBJS) $(OBJDIR)/ProxyResponder.c.o - $(CC) $+ -o $@ $(LINKOPTS) + $(CC) $+ -o $@ $(LINKOPTS) $(TLSLIBS) $(BUILDDIR)/mDNSNetMonitor: $(SPECIALOBJ) $(TLSOBJS) $(OBJDIR)/NetMonitor.c.o - $(CC) $+ -o $@ $(LINKOPTS) + $(CC) $+ -o $@ $(LINKOPTS) $(TLSLIBS) $(OBJDIR)/NetMonitor.c.o: $(COREDIR)/mDNS.c # Note: NetMonitor.c textually imports mDNS.c