diff options
author | Florian Weimer <fweimer@redhat.com> | 2019-04-08 10:40:31 +0200 |
---|---|---|
committer | Florian Weimer <fweimer@redhat.com> | 2019-04-08 10:56:22 +0200 |
commit | 3f8b44be0a658266adff5ece1e4bc3ce097a5dbe (patch) | |
tree | 060ffb11ccd5433902b8c60c3e80dc0f140ec55d /resolv/Makefile | |
parent | aarch64: thunderx2 memcpy implementation cleanup and streamlining (diff) | |
download | glibc-3f8b44be0a658266adff5ece1e4bc3ce097a5dbe.tar.gz glibc-3f8b44be0a658266adff5ece1e4bc3ce097a5dbe.tar.bz2 glibc-3f8b44be0a658266adff5ece1e4bc3ce097a5dbe.zip |
resolv: Remove support for RES_USE_INET6 and the inet6 option
This functionality was deprecated in glibc 2.25.
This commit only includes the core changes to remove the
functionality. It does not remove the RES_USE_INET6 handling in the
individual NSS service modules and the res_use_inet6 function.
These changes will happen in future commits.
Diffstat (limited to 'resolv/Makefile')
-rw-r--r-- | resolv/Makefile | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/resolv/Makefile b/resolv/Makefile index ebe1b733f2..3f84443742 100644 --- a/resolv/Makefile +++ b/resolv/Makefile @@ -52,7 +52,6 @@ tests += \ tst-ns_name_pton \ tst-res_hconf_reorder \ tst-res_hnok \ - tst-res_use_inet6 \ tst-resolv-basic \ tst-resolv-binary \ tst-resolv-edns \ @@ -70,13 +69,10 @@ tests += \ tst-resolv-ai_idn-nolibidn2 \ tst-resolv-canonname \ -# uses DEPRECATED_RES_USE_INET6 from <resolv-internal.h>. +# Needs resolv_context. tests-internal += \ tst-resolv-res_init \ tst-resolv-res_init-thread \ - -# Needs resolv_context. -tests-internal += \ tst-resolv-res_ninit \ tst-resolv-threads \ @@ -175,7 +171,6 @@ $(objpfx)mtrace-tst-resolv-res_ninit.out: $(objpfx)tst-resolv-res_ninit.out $(objpfx)tst-bug18665-tcp: $(objpfx)libresolv.so $(shared-thread-library) $(objpfx)tst-bug18665: $(objpfx)libresolv.so $(shared-thread-library) -$(objpfx)tst-res_use_inet6: $(objpfx)libresolv.so $(shared-thread-library) $(objpfx)tst-resolv-ai_idn: \ $(libdl) $(objpfx)libresolv.so $(shared-thread-library) $(objpfx)tst-resolv-ai_idn-latin1: \ @@ -211,7 +206,3 @@ $(objpfx)tst-ns_name_compress: $(objpfx)libresolv.so $(objpfx)tst-ns_name_pton: $(objpfx)libresolv.so $(objpfx)tst-res_hnok: $(objpfx)libresolv.so $(objpfx)tst-p_secstodate: $(objpfx)libresolv.so - - -# This test case uses the deprecated RES_USE_INET6 resolver option. -CFLAGS-tst-res_use_inet6.c += -Wno-error |