From patchwork Thu Jan 11 18:21:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 859230 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-89100-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="YfNRokMy"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zHZ3X6PCVz9s7M for ; Fri, 12 Jan 2018 05:22:16 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:to:subject:mime-version:content-type :content-transfer-encoding:message-id:from; q=dns; s=default; b= WQl/eNk51+S8Z7r53yfM/o1A5sgK6h/v6JsvF/wXe5VnPaNVHjcFJiTNFdJc17Ry m+uSrziaiTjn0YBK97/jIKwXtYH8kAaU6z+ENSWxmBHSsx9P8Y1hpdHxcoeBvEIP Q5WiJxKnczow3VkGEZWBcYduGZDUwlPBBrwSOzUy99o= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:to:subject:mime-version:content-type :content-transfer-encoding:message-id:from; s=default; bh=qyAjvL KWzqx7iAsk0OiuDDumI5E=; b=YfNRokMyp0w9HOl1NSTwvnp9aBEl6U3BR8Uhft nzpBgN1KW7q+c1+q5rLgRIwG8kYOAHTeN6Sz5x+D332S9RLMI6zSOt2B+wle3UNq S79FqUpV/JP/acHIEK+EvQ6R5tN9h5FWJpPKanSr54CgqOwpmKnznxGeVB/P7+Kx A+wk4= Received: (qmail 89325 invoked by alias); 11 Jan 2018 18:22:11 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 89305 invoked by uid 89); 11 Jan 2018 18:22:10 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy= X-HELO: mx1.redhat.com Date: Thu, 11 Jan 2018 19:21:59 +0100 To: libc-alpha@sourceware.org Subject: [PATCH] libnsl: Do not install libnsl.so, libnsl.a if NIS is disabled [BZ #22701] User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Message-Id: <20180111182159.2E32B4070C60A@oldenburg.str.redhat.com> From: fweimer@redhat.com (Florian Weimer) This also skips building the .o files for libnsl.a. 2018-01-11 Florian Weimer * nis/Makefile (install-lib-ldscripts, $(inst_libdir)/libnsl.so): Prevent installation of libnsl.so. (libnsl-inhibit-o): Do not build (or install) static libraries. Reviewed-by: Carlos O'Donell diff --git a/nis/Makefile b/nis/Makefile index b828c5ec4d..702c31eb63 100644 --- a/nis/Makefile +++ b/nis/Makefile @@ -69,7 +69,15 @@ libnss_nis-inhibit-o = $(filter-out .os,$(object-suffixes)) libnss_nisplus-routines := $(addprefix nisplus-,$(databases)) nisplus-parser \ nss-nisplus nisplus-initgroups libnss_nisplus-inhibit-o = $(filter-out .os,$(object-suffixes)) -endif + +else # not $(build-obsolete-nsl) +# Pretend that libnsl.so is a linker script, so that the symbolic link +# is not installed. +install-lib-ldscripts = libnsl.so +$(inst_libdir)/libnsl.so: +libnsl-inhibit-o = .o # Build no static libnsl.a. + +endif # not $(build-obsolete-nsl) include ../Rules