From 76b8442db51a8976de19934638a42532a3af607f Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Fri, 17 Jul 2020 15:19:35 +0200
Subject: Move <rpc/netdb.h> from sunrpc to inet

Restore <rpc/netdb.h> as an installed header. Delete the dummy header
resolv/rpc/netdb.h because inet is not an optional glibc component
(so its <rpc/netdb.h> is always available).

Fixes commit acb527929d0c2b3bb0798472c42ddb3203729708 ("Move
non-deprecated RPC-related functions from sunrpc to inet") in
combination with commit 5500cdba4018ddbda7909bc7f4f9718610b43cf0
("Remove --enable-obsolete-rpc configure flag").
---
 resolv/Makefile | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'resolv/Makefile')

diff --git a/resolv/Makefile b/resolv/Makefile
index f131e4b014..b61c0c3e0c 100644
--- a/resolv/Makefile
+++ b/resolv/Makefile
@@ -126,13 +126,6 @@ tests-special += $(objpfx)mtrace-tst-resolv-res_ninit.out
 endif
 endif
 
-ifeq (,$(filter sunrpc,$(subdirs)))
-# The netdb.h we install does '#include <rpc/netdb.h>', so one must exist.
-# If sunrpc/ is built in this configuration, it installs a real <rpc/netdb.h>.
-# If that's not going to happen, install our dummy file.
-headers += rpc/netdb.h
-endif
-
 generated += mtrace-tst-leaks.out tst-leaks.mtrace \
 	     mtrace-tst-leaks2.out tst-leaks2.mtrace \
 	     mtrace-tst-resolv-res_ninit.out tst-resolv-res_ninit.mtrace \
-- 
cgit 1.4.1