Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 137052 | Differences between
and this patch

Collapse All | Expand All

(-)mDNSResponder-107.5.orig/Clients/Makefile (-7 / +11 lines)
Lines 51-62 Link Here
51
51
52
#############################################################################
52
#############################################################################
53
53
54
# On OS X the dns_sd library functions are included in libSystem, which is implicitly linked with every executable
54
ifneq "$(wildcard ../mDNSPosix/build/prod/libdns_sd.*)" ""
55
# 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
55
	LIBS ?= -L../mDNSPosix/build/prod/ -ldns_sd
56
ifneq "$(wildcard /usr/lib/libSystem.dylib)" ""
56
endif
57
LIBS =
57
58
else
58
ifneq "$(wildcard ../mDNSPosix/build/debug/libdns_sd.*)" ""
59
LIBS = -L../mDNSPosix/build/prod/ -ldns_sd
59
	LIBS ?= -L../mDNSPosix/build/debug/ -ldns_sd
60
endif
61
62
ifneq "$(wildcard /usr/lib/libdns_sd.*)" ""
63
	LIBS ?= -ldns_sd
60
endif
64
endif
61
65
62
targets: build/dns-sd
66
targets: build/dns-sd
Lines 68-71 Link Here
68
	mkdir build
72
	mkdir build
69
73
70
build/dns-sd: build dns-sd.c
74
build/dns-sd: build dns-sd.c
71
	cc $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -o $@
75
	$(CC) $(CFLAGS_OPT) $(LDFLAGS) $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -o $@
(-)mDNSResponder-107.5.orig/mDNSPosix/Makefile (-41 / +33 lines)
Lines 401-413 Link Here
401
endif
401
endif
402
endif
402
endif
403
403
404
CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_OS) $(CFLAGS_DEBUG)
404
CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_OS) $(CFLAGS_DEBUG) $(OPT_CFLAGS)
405
405
406
#############################################################################
406
#############################################################################
407
407
408
all: setup Daemon libdns_sd Clients SAClient SAResponder SAProxyResponder Identify NetMonitor dnsextd $(OPTIONALTARG)
408
all: setup Daemon Clients SAClient SAResponder SAProxyResponder Identify NetMonitor dnsextd $(OPTIONALTARG)
409
409
410
install: setup InstalledDaemon InstalledStartup InstalledLib InstalledManPages InstalledClients $(OPTINSTALL)
410
install: setup InstalledDaemon InstalledLib InstalledManPages InstalledClients $(OPTINSTALL)
411
411
412
# 'setup' sets up the build directory structure the way we want
412
# 'setup' sets up the build directory structure the way we want
413
setup:
413
setup:
Lines 432-439 Link Here
432
Daemon: setup $(BUILDDIR)/mdnsd
432
Daemon: setup $(BUILDDIR)/mdnsd
433
	@echo "Responder daemon done"
433
	@echo "Responder daemon done"
434
434
435
$(BUILDDIR)/mdnsd: $(DAEMONOBJS)
435
$(BUILDDIR)/mdnsd: $(BUILDDIR)/libdns_sd.$(LDSUFFIX) $(DAEMONOBJS)
436
	$(CC) -o $@ $+ $(CFLAGS) $(LIBFLAGS)
436
	$(CC) -o $@ $+ $(CFLAGS) $(BUILDDIR)/libdns_sd.$(LDSUFFIX) $(LIBFLAGS)
437
	@$(STRIP) $@
437
	@$(STRIP) $@
438
438
439
# libdns_sd target builds the client library
439
# libdns_sd target builds the client library
Lines 443-505 Link Here
443
CLIENTLIBOBJS = $(OBJDIR)/dnssd_clientlib.c.so.o $(OBJDIR)/dnssd_clientstub.c.so.o $(OBJDIR)/dnssd_ipc.c.so.o
443
CLIENTLIBOBJS = $(OBJDIR)/dnssd_clientlib.c.so.o $(OBJDIR)/dnssd_clientstub.c.so.o $(OBJDIR)/dnssd_ipc.c.so.o
444
444
445
$(BUILDDIR)/libdns_sd.$(LDSUFFIX): $(CLIENTLIBOBJS)
445
$(BUILDDIR)/libdns_sd.$(LDSUFFIX): $(CLIENTLIBOBJS)
446
	@$(LD) $(LIBFLAGS) -o $@ $+
446
	@$(LD) $(LIBFLAGS) -Wl,-soname=libdns_sd.$(LDSUFFIX).$(LIBVERS) -o $@ $+
447
	@$(STRIP) $@
447
	@$(STRIP) $@
448
448
449
Clients: setup libdns_sd ../Clients/build/dns-sd
449
Clients: setup ../Clients/build/dns-sd
450
	@echo "Clients done"
450
	@echo "Clients done"
451
451
452
../Clients/build/dns-sd:
452
../Clients/build/dns-sd: $(BUILDDIR)/libdns_sd.$(LDSUFFIX)
453
	@$(MAKE) -C ../Clients
453
	@$(MAKE) -C ../Clients
454
454
455
# nss_mdns target builds the Name Service Switch module
455
# nss_mdns target builds the Name Service Switch module
456
nss_mdns: setup $(BUILDDIR)/$(NSSLIBFILE)
456
nss_mdns: setup $(BUILDDIR)/$(NSSLIBFILE)
457
	@echo "Name Service Switch module done"
457
	@echo "Name Service Switch module done"
458
458
459
$(BUILDDIR)/$(NSSLIBFILE): $(CLIENTLIBOBJS) $(OBJDIR)/nss_mdns.c.so.o
459
$(BUILDDIR)/$(NSSLIBFILE): $(CLIENTLIBOBJS) $(BUILDDIR)/libdns_sd.$(LDSUFFIX) $(OBJDIR)/nss_mdns.c.so.o
460
	@$(LD) $(LIBFLAGS) -o $@ $+
460
	@$(LD) $(LIBFLAGS) $(BUILDDIR)/libdns_sd.$(LDSUFFIX) -Wl,-soname=$(NSSLINKNAME) -o $@ $+
461
	@$(STRIP) $@
461
	@$(STRIP) $@
462
462
463
#############################################################################
463
#############################################################################
464
464
465
# The Install targets place built stuff in their proper places
465
# The Install targets place built stuff in their proper places
466
InstalledDaemon: $(INSTBASE)/sbin/mdnsd
466
InstalledDaemon: $(DESTDIR)$(INSTBASE)/sbin/mdnsd
467
	@echo $+ " installed"
467
	@echo $+ " installed"
468
468
469
InstalledLib: $(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS) $(INSTBASE)/include/dns_sd.h
469
InstalledLib: $(DESTDIR)$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS) $(DESTDIR)$(INSTBASE)/include/dns_sd.h
470
	@echo $+ " installed"
470
	@echo $+ " installed"
471
471
472
InstalledStartup: $(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME)
472
InstalledStartup: $(DESTDIR)$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME)
473
	@echo $+ " installed"
473
	@echo $+ " installed"
474
474
475
InstalledManPages: $(MANPATH)/man8/mdnsd.8
475
InstalledManPages: $(DESTDIR)$(MANPATH)/man8/mdnsd.8
476
	@echo $+ " installed"
476
	@echo $+ " installed"
477
477
478
InstalledClients: $(INSTBASE)/bin/dns-sd
478
InstalledClients: $(DESTDIR)$(INSTBASE)/bin/dns-sd
479
	@echo $+ " installed"
479
	@echo $+ " installed"
480
480
481
InstalledNSS: $(NSSINSTPATH)/$(NSSLINKNAME) /etc/nss_mdns.conf $(MANPATH)/man5/nss_mdns.conf.5 $(MANPATH)/man8/libnss_mdns.8
481
InstalledNSS: $(DESTDIR)$(NSSINSTPATH)/$(NSSLINKNAME) $(DESTDIR)etc/nss_mdns.conf $(DESTDIR)$(MANPATH)/man5/nss_mdns.conf.5 $(DESTDIR)$(MANPATH)/man8/libnss_mdns.8
482
	@echo $+ " installed"
482
	@echo $+ " installed"
483
483
484
# Note: If daemon already installed, we make sure it's stopped before overwriting it
484
# Note: If daemon already installed, we make sure it's stopped before overwriting it
485
$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd
485
$(DESTDIR)$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd
486
	@if test -x $@; then $(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) stop; fi
486
	@if test -x $@; then $(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) stop; fi
487
	$(CP) $< $@
487
	$(CP) $< $@
488
488
489
$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libdns_sd.$(LDSUFFIX)
489
$(DESTDIR)$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libdns_sd.$(LDSUFFIX)
490
	$(CP) $< $@
490
	$(CP) $< $@
491
	$(LN) $@ $(INSTBASE)/lib/libdns_sd.$(LDSUFFIX)
491
	$(LN) libdns_sd.$(LDSUFFIX).$(LIBVERS) $(DESTDIR)$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX)
492
ifdef LDCONFIG
493
    # -m means 'merge into existing database', -R means 'rescan directories'
494
	$(LDCONFIG) -mR
495
endif
496
492
497
$(INSTBASE)/include/dns_sd.h: $(SHAREDDIR)/dns_sd.h
493
$(DESTDIR)$(INSTBASE)/include/dns_sd.h: $(SHAREDDIR)/dns_sd.h
498
	$(CP) $< $@
494
	$(CP) $< $@
499
495
500
# We make this target dependent on $(INSTBASE)/sbin/mdnsd because we need to ensure
496
# We make this target dependent on $(INSTBASE)/sbin/mdnsd because we need to ensure
501
# that the daemon is installed *before* we try to execute the command to start it.
497
# that the daemon is installed *before* we try to execute the command to start it.
502
$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME): mdnsd.sh $(STARTUPSCRIPTDIR) $(INSTBASE)/sbin/mdnsd
498
$(DESTDIR)$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME): mdnsd.sh $(STARTUPSCRIPTDIR)
503
	$(CP) $< $@
499
	$(CP) $< $@
504
	chmod ugo+x $@
500
	chmod ugo+x $@
505
	$@ start
501
	$@ start
Lines 516-551 Link Here
516
endif
512
endif
517
endif
513
endif
518
514
519
$(MANPATH)/man5/%.5: %.5
515
$(DESTDIR)$(MANPATH)/man5/%.5: %.5
520
	cp $< $@
516
	cp $< $@
521
	chmod 444 $@
517
	chmod 444 $@
522
518
523
$(MANPATH)/man8/%.8: %.8
519
$(DESTDIR)$(MANPATH)/man8/%.8: %.8
524
	cp $< $@
520
	cp $< $@
525
	chmod 444 $@
521
	chmod 444 $@
526
522
527
$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponder.8
523
$(DESTDIR)$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponder.8
528
	cp $< $@
524
	cp $< $@
529
	chmod 444 $@
525
	chmod 444 $@
530
526
531
$(INSTBASE)/bin/dns-sd: ../Clients/build/dns-sd
527
$(DESTDIR)$(INSTBASE)/bin/dns-sd: ../Clients/build/dns-sd
528
	mkdir $(DESTDIR)$(INSTBASE)/bin
532
	$(CP) $< $@
529
	$(CP) $< $@
533
530
534
$(NSSINSTPATH)/$(NSSLINKNAME): $(NSSINSTPATH)/$(NSSLIBFILE)
531
$(DESTDIR)$(NSSINSTPATH)/$(NSSLINKNAME): $(DESTDIR)$(NSSINSTPATH)/$(NSSLIBFILE)
535
	$(LN) $< $@
532
	$(LN) $(NSSLIBFILE) $@
536
	ldconfig
537
533
538
$(NSSINSTPATH)/$(NSSLIBFILE): $(BUILDDIR)/$(NSSLIBFILE)
534
$(DESTDIR)$(NSSINSTPATH)/$(NSSLIBFILE): $(BUILDDIR)/$(NSSLIBFILE)
539
	$(CP) $< $@
535
	$(CP) $< $@
540
	chmod 444 $@
536
	chmod 444 $@
541
537
542
/etc/nss_mdns.conf: nss_mdns.conf
538
$(DESTDIR)etc/nss_mdns.conf: nss_mdns.conf
543
	$(CP) $< $@
539
	$(CP) $< $@
544
	chmod 444 $@
540
	chmod 444 $@
545
	# Check the nsswitch.conf file.
546
	# If 'mdns' does not already appear on the "hosts:" line, then add it right before 'dns'
547
	cp -f /etc/nsswitch.conf /etc/nsswitch.conf.pre-mdns
548
	sed -e '/mdns/!s/^\(hosts:.*\)dns\(.*\)/\1mdns dns\2/' /etc/nsswitch.conf.pre-mdns > /etc/nsswitch.conf
549
541
550
#############################################################################
542
#############################################################################
551
543
Lines 577-583 Link Here
577
$(BUILDDIR)/dns_sd.jar: $(JARCONTENTS) setup
569
$(BUILDDIR)/dns_sd.jar: $(JARCONTENTS) setup
578
	$(JAR) -cf $@ -C $(OBJDIR) com
570
	$(JAR) -cf $@ -C $(OBJDIR) com
579
571
580
$(BUILDDIR)/libjdns_sd.$(LDSUFFIX): $(JAVASRC)/JNISupport.c $(OBJDIR)/DNSSD.java.h setup libdns_sd
572
$(BUILDDIR)/libjdns_sd.$(LDSUFFIX): $(JAVASRC)/JNISupport.c $(OBJDIR)/DNSSD.java.h setup $(BUILDDIR)/libdns_sd.$(LDSUFFIX)
581
	$(CC) -o $@ $< $(JAVACFLAGS) -I$(OBJDIR) -L$(BUILDDIR)
573
	$(CC) -o $@ $< $(JAVACFLAGS) -I$(OBJDIR) -L$(BUILDDIR)
582
574
583
$(OBJDIR)/com/apple/dnssd/%.class:	$(JAVASRC)/%.java
575
$(OBJDIR)/com/apple/dnssd/%.class:	$(JAVASRC)/%.java
Lines 642-649 Link Here
642
$(BUILDDIR)/mDNSNetMonitor:          $(SPECIALOBJ) $(OBJDIR)/NetMonitor.c.o
634
$(BUILDDIR)/mDNSNetMonitor:          $(SPECIALOBJ) $(OBJDIR)/NetMonitor.c.o
643
	$(CC) $+ -o $@ $(LIBFLAGS)
635
	$(CC) $+ -o $@ $(LIBFLAGS)
644
636
645
$(BUILDDIR)/dnsextd:                 $(SPECIALOBJ) $(OBJDIR)/dnsextd.c.threadsafe.o
637
$(BUILDDIR)/dnsextd:                 $(SPECIALOBJ) $(OBJDIR)/dnsextd.c.threadsafe.o $(BUILDDIR)/libdns_sd.$(LDSUFFIX)
646
	$(CC) $+ -o $@ $(LIBFLAGS) -lpthread
638
	$(CC) $+ -o $@ $(BUILDDIR)/libdns_sd.$(LDSUFFIX) $(LIBFLAGS) -lpthread
647
639
648
#############################################################################
640
#############################################################################
649
641

Return to bug 137052