From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <shebs@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2154)
 id 04AC2384A87E; Tue,  3 Nov 2020 21:43:54 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 04AC2384A87E
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Stan Shebs <shebs@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc/google/grte/v5-2.27/master] Update build process to create
 libnsl stub
X-Act-Checkin: glibc
X-Git-Author: Stan Shebs <stanshebs@google.com>
X-Git-Refname: refs/heads/google/grte/v5-2.27/master
X-Git-Oldrev: f0189fe6241e06dc19c7c15ed7374bd19d6d16bb
X-Git-Newrev: c7c6fb593624e447c4329fb64ef6f6fd00d9ea5f
Message-Id: <20201103214354.04AC2384A87E@sourceware.org>
Date: Tue,  3 Nov 2020 21:43:54 +0000 (GMT)
X-BeenThere: glibc-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Glibc-cvs mailing list <glibc-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/glibc-cvs/>
List-Help: <mailto:glibc-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Nov 2020 21:43:54 -0000

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c7c6fb593624e447c4329fb64ef6f6fd00d9ea5f

commit c7c6fb593624e447c4329fb64ef6f6fd00d9ea5f
Author: Stan Shebs <stanshebs@google.com>
Date:   Tue Nov 3 13:30:16 2020 -0800

    Update build process to create libnsl stub

Diff:
---
 Makeconfig                     | 2 +-
 google-nsl-stub/shlib-versions | 2 +-
 nis/Makefile                   | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makeconfig b/Makeconfig
index f5cd92014f..c1a395a105 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -1248,7 +1248,7 @@ all-subdirs = csu assert ctype locale intl catgets math setjmp signal	    \
 	      grp pwd posix io termios resource misc socket sysvipc gmon    \
 	      gnulib iconv iconvdata wctype manual shadow gshadow po argp   \
 	      crypt localedata timezone rt conform debug mathvec support    \
-	      dlfcn elf
+	      dlfcn elf google-nsl-stub
 
 ifndef avoid-generated
 # sysd-sorted itself will contain rules making the sysd-sorted target
diff --git a/google-nsl-stub/shlib-versions b/google-nsl-stub/shlib-versions
index ca13c8c1f6..1c88e0caa8 100644
--- a/google-nsl-stub/shlib-versions
+++ b/google-nsl-stub/shlib-versions
@@ -1 +1 @@
-.*-.*-.*	libnsl=1
+libnsl=1
diff --git a/nis/Makefile b/nis/Makefile
index d77c6e0c8e..1f8f153ed4 100644
--- a/nis/Makefile
+++ b/nis/Makefile
@@ -34,7 +34,8 @@ databases		= proto service hosts network grp pwd rpc ethers \
 services		:= nis nisplus
 endif
 
-extra-libs		= libnsl
+# Suppress regular libnsl build in favor of the stub in google-nsl-stub.
+#extra-libs		= libnsl
 ifeq ($(build-obsolete-nsl),yes)
 extra-libs += $(services:%=libnss_%)
 endif