From patchwork Fri Apr 8 13:33:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thorsten Kukuk X-Patchwork-Id: 11671 Received: (qmail 27784 invoked by alias); 8 Apr 2016 13:33:56 -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 26840 invoked by uid 89); 8 Apr 2016 13:33:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=sk:headers, senior, HContent-Transfer-Encoding:8bit X-HELO: mx2.suse.de Date: Fri, 8 Apr 2016 15:33:50 +0200 From: Thorsten Kukuk To: libc-alpha@sourceware.org Subject: [PATCH] Disable rest of sunrpc, too Message-ID: <20160408133350.GA20461@suse.de> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Hi, If sunrpc code is disabled, we should not build and install header files, rpcgen or librpcsvc.a by default. * sunrpc/Makefile: don't build and install header files, rpcgen and librpcsvc.a by default. diff --git a/sunrpc/Makefile b/sunrpc/Makefile --- a/sunrpc/Makefile +++ b/sunrpc/Makefile @@ -48,11 +48,10 @@ include ../Makeconfig rpcsvc = bootparam_prot.x nlm_prot.x rstat.x \ yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \ rusers.x spray.x nfs_prot.x rquota.x key_prot.x -headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \ - pmap_prot.h pmap_rmt.h rpc.h rpc_msg.h \ - svc.h svc_auth.h types.h xdr.h auth_des.h \ - des_crypt.h) -headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \ +headers-sunrpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \ + pmap_prot.h pmap_rmt.h rpc.h rpc_msg.h \ + svc.h svc_auth.h types.h xdr.h auth_des.h \ + des_crypt.h key_prot.h rpc_des.h) \ $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h headers = rpc/netdb.h install-others = $(inst_sysconfdir)/rpc @@ -61,7 +60,7 @@ generated += $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \ generated-dirs += rpcsvc ifeq ($(link-obsolete-rpc),yes) -headers += $(headers-in-tirpc) $(headers-not-in-tirpc) +headers += $(headers-sunrpc) endif ifeq ($(build-shared),yes) @@ -85,6 +84,7 @@ shared-only-routines = $(routines) endif endif +ifeq ($(link-obsolete-rpc),yes) # We do not build rpcinfo anymore. It is not needed for a bootstrap # and not wanted on complete systems. # others := rpcinfo @@ -95,6 +95,7 @@ rpcgen-objs = rpc_main.o rpc_hout.o rpc_cout.o rpc_parse.o \ rpc_tblout.o rpc_sample.o extra-objs = $(rpcgen-objs) $(addprefix cross-,$(rpcgen-objs)) others += rpcgen +endif tests = tst-xdrmem tst-xdrmem2 test-rpcent xtests := tst-getmyaddr @@ -103,12 +104,14 @@ ifeq ($(have-thread-library),yes) xtests += thrsvc endif +ifeq ($(link-obsolete-rpc),yes) headers += $(rpcsvc:%.x=rpcsvc/%.h) extra-libs := librpcsvc extra-libs-others := librpcsvc # Make it in `others' pass, not `lib' pass. librpcsvc-routines = $(rpcsvc:%.x=x%) librpcsvc-inhibit-o = .os # Build no shared rpcsvc library. omit-deps = $(librpcsvc-routines) +endif ifeq (yes,$(build-shared)) rpc-compat-routines = $(addprefix compat-,$(need-export-routines))