AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 20:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cope without sunrpc.

Browse Source
This commit is contained in:
Roland McGrath 2013-08-27 10:59:57 -07:00
parent c4e42566cf
commit bd81123a8b
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2013-08-27 Roland McGrath <roland@hack.frob.com> 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_send.c (send_dg): Don't try to use ioctl unless [FIONREAD].
* resolv/res_hconf.c [!NOT_IN_libc] (ifaddrs): Declare * resolv/res_hconf.c [!NOT_IN_libc] (ifaddrs): Declare

10
Makefile
View File

@ -138,16 +138,22 @@ $(common-objpfx)linkobj/libc.so: $(elfobjdir)/soinit.os \
$(shlib-lds) $(shlib-lds)
$(build-shlib) $(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)linkobj/libc_pic.a: $(common-objpfx)libc_pic.a \
$(common-objpfx)sunrpc/librpc_compat_pic.a $(common-objpfx)sunrpc/librpc_compat_pic.a
$(..)./scripts/mkinstalldirs $(common-objpfx)linkobj $(make-target-directory)
(cd $(common-objpfx)linkobj; \ (cd $(common-objpfx)linkobj; \
$(AR) x ../libc_pic.a; \ $(AR) x ../libc_pic.a; \
rm $$($(AR) t ../sunrpc/librpc_compat_pic.a | sed 's/^compat-//'); \ rm $$($(AR) t ../sunrpc/librpc_compat_pic.a | sed 's/^compat-//'); \
$(AR) x ../sunrpc/librpc_compat_pic.a; \ $(AR) x ../sunrpc/librpc_compat_pic.a; \
$(AR) cr libc_pic.a *.os; \ $(AR) cr libc_pic.a *.os; \
rm *.os) rm *.os)
endif endif # $(subdirs) contains sunrpc
endif # $(build-shared)
# This is a handy script for running any dynamically linked program against # This is a handy script for running any dynamically linked program against