This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH] Don't compile non-lib modules as lib modules [BZ #21864]
- From: "H.J. Lu" <hjl dot tools at gmail dot com>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Date: Sun, 20 Aug 2017 10:59:22 -0700
- Subject: Re: [PATCH] Don't compile non-lib modules as lib modules [BZ #21864]
- Authentication-results: sourceware.org; auth=none
- References: <20170813173910.GA15729@gmail.com>
On Sun, Aug 13, 2017 at 10:39 AM, H.J. Lu <hjl.tools@gmail.com> wrote:
> Some programs have more than one source files. These non-lib modules
> should not be compiled with -DMODULE_NAME=libc. This patch puts these
> non-lib modules in $(others-extras) and adds $(others-extras) to
> all-nonlib.
>
> Tested on i686 and x86-64. OK for master?
Any comments or objections? If there is no objection, I will check it in
tomorrow.
> H.J.
> ---
> [BZ #21864]
> * Makerules (all-nonlib): Add $(others-extras).
> * catgets/Makefile (others-extras): New.
> * elf/Makefile (others-extras): Likewise.
> * nss/Makefile (others-extras): Likewise.
> ---
> Makerules | 3 ++-
> catgets/Makefile | 1 +
> elf/Makefile | 1 +
> nss/Makefile | 1 +
> 4 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/Makerules b/Makerules
> index 9bb707c168..8f1324d8e9 100644
> --- a/Makerules
> +++ b/Makerules
> @@ -1359,7 +1359,8 @@ lib := testsuite
> include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
> endif
>
> -all-nonlib := $(strip $(tests-internal) $(test-internal-extras) $(others))
> +all-nonlib := $(strip $(tests-internal) $(test-internal-extras) \
> + $(others) $(others-extras))
> ifneq (,$(all-nonlib))
> cpp-srcs-left = $(all-nonlib)
> lib := nonlib
> diff --git a/catgets/Makefile b/catgets/Makefile
> index e5f49491fb..39aab67c14 100644
> --- a/catgets/Makefile
> +++ b/catgets/Makefile
> @@ -38,6 +38,7 @@ tests-special += $(objpfx)tst-catgets-mem.out
> endif
>
> gencat-modules = xmalloc
> +others-extras = $(gencat-modules)
>
> # To find xmalloc.c
> vpath %.c ../locale/programs
> diff --git a/elf/Makefile b/elf/Makefile
> index d314a5fa7e..7cf959aabd 100644
> --- a/elf/Makefile
> +++ b/elf/Makefile
> @@ -112,6 +112,7 @@ install-rootsbin += ldconfig
>
> ldconfig-modules := cache readlib xmalloc xstrdup chroot_canon static-stubs
> extra-objs += $(ldconfig-modules:=.o)
> +others-extras = $(ldconfig-modules)
> endif
> endif
>
> diff --git a/nss/Makefile b/nss/Makefile
> index d9f6d41181..87a0ed7134 100644
> --- a/nss/Makefile
> +++ b/nss/Makefile
> @@ -46,6 +46,7 @@ CPPFLAGS-getent.c = -DHAVE_SUNRPC=$(have-sunrpc)
> others := getent makedb
> install-bin := getent makedb
> makedb-modules = xmalloc hash-string
> +others-extras = $(makedb-modules)
> extra-objs += $(makedb-modules:=.o)
>
> tests-static = tst-field
> --
> 2.13.4
>
--
H.J.