From 72edf29d1feeb23bc5e0c16236812b095c9c3788 Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Sun, 28 Dec 2014 00:15:26 -0500
Subject: [PATCH] Remove rpcnis-headers

Now installed by glibc option --enable-obsolete-rpc
---
 config/packages-list   |  1 -
 stage3/packages-update |  1 -
 stage3/pkg/libtirpc    | 13 ++-----------
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/config/packages-list b/config/packages-list
index b4fc4a3..b019ed6 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -254,7 +254,6 @@ LIBSPECTRE="libspectre-0.2.7"
 LIBTASN1="libtasn1-4.2"
 LIBTHEORA="libtheora-1.1.1"
 LIBTIRPC="libtirpc-0.2.5"
-RPCNIS_HEADERS="rpcnis-headers"
 LIBTOOL="libtool-2.4.2"
 LIBVORBIS="libvorbis-1.3.4"
 VORBIS_TOOLS="vorbis-tools-1.4.0"
diff --git a/stage3/packages-update b/stage3/packages-update
index e63a516..8efb093 100755
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -18,7 +18,6 @@ fpkg -e "tar.xz" -s "software/network/rfkill" ${RFKILL} ${KERNEL_URL}
 fpkg ${REISERFSPROGS} "ftp://anduin.linuxfromscratch.org/BLFS/svn/r"
 fpkg -e "tar.gz" ${POPT} "http://rpm5.org/files/popt"
 fpkg -m sf ${LIBTIRPC}
-fpkg ${RPCNIS_HEADERS} "http://anduin.linuxfromscratch.org/other"
 fpkg ${PAM} "https://fedorahosted.org/releases/l/i/linux-pam"
 fpkg -e "tar.gz" -f "${FCRON}.src" ${FCRON} "http://fcron.free.fr/archives"
 fpkg -e "tar.gz" ${OPENSSL} "ftp://ftp.openssl.org/source"
diff --git a/stage3/pkg/libtirpc b/stage3/pkg/libtirpc
index d8f79d0..61a11cf 100644
--- a/stage3/pkg/libtirpc
+++ b/stage3/pkg/libtirpc
@@ -2,18 +2,9 @@
 
 hvconfig_pre()
 {
-    # WARNING: THIS SHOULD be replaced by --enable-obsolete-rpc in glibc installation...
-    # Then remove package ${RPCNIS_HEADERS}.......
-
-    # Glibc-2.14 and later do not install NIS and RPC related headers by
-    # default. If needed, install them here:
-    if [ ! -r /usr/include/rpc/rpc.h ]; then
-        decompress_package ${RPCNIS_HEADERS} /usr/include
-    fi
-
     # Need autoreconf after applying patch
-    cd ${LFS_TMP}/${PACKAGE}
-    autoreconf -i
+    cd ${SRC_DIR}
+    autoreconf -vi
 }
 
 hvbuild_post()
-- 
2.20.1