mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-21 00:50:04 +00:00
cd5743fdec
* include/resolv.h: Remove hidden proto declarations for __ns_* functions. Add them for __dn_count_labels and __p_secstodate. * include/arpa/nameser.h: Add a number of hidden proto declarations. Define ns_msg_getflags macro here. * resolv/res_debug.c: Add hidden definition for __dn_count_labels and __p_secstodate. * resolv/Versions: Export functions from <arpa/nameser.h> from libresolv in version GLIBC_2.9. * resolv/ns_name.c: Integrate changes from bind 9.5.0. Add necessary hidden definitions. * resolv/ns_netint.c: Likewise. * resolv/ns_parse.c: Likewise. * resolv/ns_print.c: Likewise. * resolv/ns_samedomain.c: Likewise. * resolv/ns_ttl.c: Likewise. * resolv/arpa/nameser_compat.h: Likewise. * resolv/arpa/nameser.h: Likewise. Remove macros which redirect function calls. * resolv/nss_dns/dns-canon.c (_nss_dns_getcanonname_r): Use __ns_get16 instead of ns_get16. * resolv/nss_dns/dns-host.c (getanswer_r): Use __ns_get16 and __ns_get32 instead of ns_get16 and ns_get32 respectively. (gaih_getanswer_slice): Likewise. * resolv/Makefile (libresolv-routines): Add ns_date. * resolv/ns_date.c: New file.
117 lines
3.8 KiB
Makefile
117 lines
3.8 KiB
Makefile
# Copyright (C) 1994-2001,2003,2004,2007,2008 Free Software Foundation, Inc.
|
|
# This file is part of the GNU C Library.
|
|
|
|
# The GNU C Library is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Lesser General Public
|
|
# License as published by the Free Software Foundation; either
|
|
# version 2.1 of the License, or (at your option) any later version.
|
|
|
|
# The GNU C Library is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# Lesser General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
# License along with the GNU C Library; if not, write to the Free
|
|
# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
# 02111-1307 USA.
|
|
|
|
#
|
|
# Sub-makefile for resolv portion of the library.
|
|
#
|
|
subdir := resolv
|
|
|
|
headers := resolv.h \
|
|
netdb.h bits/netdb.h \
|
|
arpa/nameser.h arpa/nameser_compat.h \
|
|
sys/bitypes.h
|
|
distribute := ../conf/portability.h mapv4v6addr.h mapv4v6hostent.h \
|
|
Banner res_hconf.h res_debug.h README gai_misc.h ga_test.c
|
|
|
|
routines := herror inet_addr inet_ntop inet_pton nsap_addr res_init \
|
|
res_hconf res_libc res-state
|
|
|
|
tests = tst-aton tst-leaks tst-inet_ntop
|
|
xtests = tst-leaks2
|
|
|
|
generate := mtrace-tst-leaks tst-leaks.mtrace tst-leaks2.mtrace
|
|
|
|
include ../Makeconfig
|
|
|
|
extra-libs := libresolv libnss_dns
|
|
ifeq ($(have-thread-library),yes)
|
|
extra-libs += libanl
|
|
routines += gai_sigqueue
|
|
endif
|
|
extra-libs-others = $(extra-libs)
|
|
libresolv-routines := gethnamaddr res_comp res_debug \
|
|
res_data res_mkquery res_query res_send \
|
|
inet_net_ntop inet_net_pton inet_neta base64 \
|
|
ns_parse ns_name ns_netint ns_ttl ns_print \
|
|
ns_samedomain ns_date
|
|
|
|
libanl-routines := gai_cancel gai_error gai_misc gai_notify gai_suspend \
|
|
getaddrinfo_a
|
|
|
|
subdir-dirs = nss_dns
|
|
vpath %.c nss_dns
|
|
|
|
libnss_dns-routines := dns-host dns-network dns-canon
|
|
ifneq ($(build-static-nss),yes)
|
|
libnss_dns-inhibit-o = $(filter-out .os,$(object-suffixes))
|
|
endif
|
|
|
|
ifeq (yesyes,$(build-shared)$(have-thread-library))
|
|
tests: $(objpfx)ga_test
|
|
endif
|
|
|
|
generated := mtrace-tst-leaks tst-leaks.mtrace \
|
|
mtrace-tst-leaks2 tst-leaks2.mtrace
|
|
|
|
include ../Rules
|
|
|
|
CPPFLAGS += -Dgethostbyname=res_gethostbyname \
|
|
-Dgethostbyname2=res_gethostbyname2 \
|
|
-Dgethostbyaddr=res_gethostbyaddr \
|
|
-Dgetnetbyname=res_getnetbyname \
|
|
-Dgetnetbyaddr=res_getnetbyaddr
|
|
|
|
CFLAGS-res_hconf.c = -fexceptions
|
|
|
|
# The BIND code elicits some harmless warnings.
|
|
+cflags += -Wno-strict-prototypes -Wno-write-strings
|
|
|
|
# Depend on libc.so so a DT_NEEDED is generated in the shared objects.
|
|
# This ensures they will load libc.so for needed symbols if loaded by
|
|
# a statically-linked program that hasn't already loaded it.
|
|
$(objpfx)libresolv.so: $(common-objpfx)libc.so $(common-objpfx)libc_nonshared.a
|
|
|
|
# The DNS NSS modules needs the resolver.
|
|
$(objpfx)libnss_dns.so: $(objpfx)libresolv.so $(common-objpfx)libc.so \
|
|
$(common-objpfx)libc_nonshared.a
|
|
|
|
# The asynchronous name lookup code needs the thread library.
|
|
$(objpfx)libanl.so: $(common-objpfx)libc.so $(common-objpfx)libc_nonshared.a \
|
|
$(shared-thread-library)
|
|
|
|
$(objpfx)ga_test: $(objpfx)libanl.so $(shared-thread-library)
|
|
|
|
$(objpfx)tst-leaks: $(objpfx)libresolv.so
|
|
tst-leaks-ENV = MALLOC_TRACE=$(objpfx)tst-leaks.mtrace
|
|
$(objpfx)mtrace-tst-leaks: $(objpfx)tst-leaks.out
|
|
$(common-objpfx)malloc/mtrace $(objpfx)tst-leaks.mtrace > $@
|
|
ifeq (no,$(cross-compiling))
|
|
ifneq (no,$(PERL))
|
|
tests: $(objpfx)mtrace-tst-leaks
|
|
endif
|
|
endif
|
|
|
|
tst-leaks2-ENV = MALLOC_TRACE=$(objpfx)tst-leaks2.mtrace
|
|
$(objpfx)mtrace-tst-leaks2: $(objpfx)tst-leaks2.out
|
|
$(common-objpfx)malloc/mtrace $(objpfx)tst-leaks2.mtrace > $@
|
|
ifeq (no,$(cross-compiling))
|
|
ifneq (no,$(PERL))
|
|
xtests: $(objpfx)mtrace-tst-leaks2
|
|
endif
|
|
endif
|