GNU C Library master sources branch hjl/pr21864/master created. glibc-2.26-80-g084dd1b

[hjl at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, hjl/pr21864/master has been created
        at  084dd1b58eefb40e2b98c27b83880df51ac0e761 (commit)

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=084dd1b58eefb40e2b98c27b83880df51ac0e761

commit 084dd1b58eefb40e2b98c27b83880df51ac0e761
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Sat Jul 29 21:04:09 2017 -0700

    Don't compile non-lib modules as lib modules [BZ #21864]
    
    Some programs have more than one source files, some of which are
    compiled from sources for lib modules as non-lib modules.  These
    non-lib modules should not be compiled with -DMODULE_NAME=libc.
    This patch put these non-lib modules in $(others-extras) and add
    $(others-extras) to all-nonlib.
    
    	[BZ #21864]
    	* Makerules (all-nonlib): Add $(others-extras).
    	* catgets/Makefile (others-extras): New.
    	* elf/Makefile (others-extras): Likewise.
    	* nss/Makefile (others-extras): Likewise.

diff --git a/Makerules b/Makerules
index 9bb707c..8f1324d 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 e5f4949..39aab67 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 d314a5f..7cf959a 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 d9f6d41..87a0ed7 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

-----------------------------------------------------------------------


hooks/post-receive
-- 
GNU C Library master sources