GNU C Library master sources branch master updated. glibc-2.18-35-gbd81123

[roland 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, master has been updated
       via  bd81123a8ba99ac30bcf227be5103cf2863e27cb (commit)
      from  c4e42566cfecc43f9ef3ddf9c7af57c6744e2ceb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

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

commit bd81123a8ba99ac30bcf227be5103cf2863e27cb
Author: Roland McGrath <roland@hack.frob.com>
Date:   Tue Aug 27 10:59:57 2013 -0700

    Cope without sunrpc.

diff --git a/ChangeLog b/ChangeLog
index 8ae4979..e73a301 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2013-08-27  Roland McGrath  <roland@hack.frob.com>
 
+	* Makefile ($(common-objpfx)linkobj/libc_pic.a):
+	If [sunrpc not in $(subdirs)], define to use libc_pic.a directly.
+
 	* resolv/res_send.c (send_dg): Don't try to use ioctl unless [FIONREAD].
 
 	* resolv/res_hconf.c [!NOT_IN_libc] (ifaddrs): Declare
diff --git a/Makefile b/Makefile
index 119bb26..ba1820d 100644
--- a/Makefile
+++ b/Makefile
@@ -138,16 +138,22 @@ $(common-objpfx)linkobj/libc.so: $(elfobjdir)/soinit.os \
 				 $(shlib-lds)
 	$(build-shlib)
 
+ifeq (,$(filter sunrpc,$(subdirs)))
+$(common-objpfx)linkobj/libc_pic.a: $(common-objpfx)libc_pic.a
+	$(make-target-directory)
+	ln -f $< $@
+else
 $(common-objpfx)linkobj/libc_pic.a: $(common-objpfx)libc_pic.a \
 				    $(common-objpfx)sunrpc/librpc_compat_pic.a
-	$(..)./scripts/mkinstalldirs $(common-objpfx)linkobj
+	$(make-target-directory)
 	(cd $(common-objpfx)linkobj; \
 	 $(AR) x ../libc_pic.a; \
 	 rm $$($(AR) t ../sunrpc/librpc_compat_pic.a | sed 's/^compat-//'); \
 	 $(AR) x ../sunrpc/librpc_compat_pic.a; \
 	 $(AR) cr libc_pic.a *.os; \
 	 rm *.os)
-endif
+endif # $(subdirs) contains sunrpc
+endif # $(build-shared)
 
 
 # This is a handy script for running any dynamically linked program against

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

Summary of changes:
 ChangeLog |    3 +++
 Makefile  |   10 ++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)


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