Disable rest of sunrpc, too
Commit Message
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.
Comments
Hi,
I haven't seen any feedback on this patch?
Thorsten
On Fri, Apr 08, Thorsten Kukuk wrote:
>
> 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))
>
> --
> Thorsten Kukuk, Senior Architect SLES & Common Code Base
> SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nuernberg, Germany
> GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
Hi,
About two more month and I still haven't seen any feedback on this?
What are the plans? Or will we live with glibc containing sunrpc even
further?
If there is no interest, I will stop this project and look for
alternative solutions.
Thorsten
On Tue, May 03, Thorsten Kukuk wrote:
>
> Hi,
>
> I haven't seen any feedback on this patch?
>
> Thorsten
>
> On Fri, Apr 08, Thorsten Kukuk wrote:
>
> >
> > 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))
> >
> > --
> > Thorsten Kukuk, Senior Architect SLES & Common Code Base
> > SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nuernberg, Germany
> > GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
>
> --
> Thorsten Kukuk, Senior Architect SLES & Common Code Base
> SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nuernberg, Germany
> GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
@@ -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))