]>
Commit | Line | Data |
---|---|---|
1d716dab JB |
1 | --- glibc-2.14/nis/Makefile |
2 | +++ glibc-2.14-2/nis/Makefile | |
3 | @@ -23,9 +23,9 @@ subdir := nis | |
4 | ||
5 | aux := nis_hash | |
6 | ||
7 | +headers := $(wildcard rpcsvc/*.[hx]) | |
8 | distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \ | |
9 | - nisplus-parser.h nis_xdr.h nss \ | |
10 | - $(wildcard rpcsvc/*.[hx]) | |
11 | + nisplus-parser.h nis_xdr.h nss | |
12 | ||
13 | # These are the databases available for the nis (and perhaps later nisplus) | |
14 | # service. This must be a superset of the services in nss. | |
15 | @@ -69,6 +69,8 @@ libnss_nisplus-inhibit-o = $(filter-out .os,$(object-suffixes)) | |
16 | ||
17 | include ../Rules | |
18 | ||
19 | +CFLAGS-nis_findserv.c += -fno-strict-aliasing | |
20 | +CFLAGS-ypclnt.c += -fno-strict-aliasing | |
21 | ||
22 | $(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version) | |
23 | $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \ | |
24 | --- glibc-2.14/sunrpc/Makefile | |
25 | +++ glibc-2.14-2/sunrpc/Makefile | |
26 | @@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \ | |
27 | des_crypt.h) | |
28 | headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \ | |
29 | $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h | |
30 | -headers = rpc/netdb.h | |
31 | +headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc) | |
32 | install-others = $(inst_sysconfdir)/rpc | |
33 | generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \ | |
34 | $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen | |
35 | @@ -152,6 +152,10 @@ CFLAGS-openchild.c = -fexceptions | |
36 | ||
37 | CPPFLAGS += -D_RPC_THREAD_SAFE_ | |
38 | ||
39 | +CFLAGS-clnt_tcp.c += -fno-strict-aliasing | |
40 | +CFLAGS-clnt_udp.c += -fno-strict-aliasing | |
41 | +CFLAGS-clnt_unix.c += -fno-strict-aliasing | |
42 | + | |
43 | $(objpfx)tst-getmyaddr: $(common-objpfx)linkobj/libc.so | |
44 | $(objpfx)tst-xdrmem: $(common-objpfx)linkobj/libc.so | |
45 | $(objpfx)tst-xdrmem2: $(common-objpfx)linkobj/libc.so | |
46 | --- glibc-2.14/include/libc-symbols.h | |
47 | +++ glibc-2.14-2/include/libc-symbols.h | |
48 | @@ -635,7 +635,7 @@ for linking") | |
49 | # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) | |
50 | # define libc_hidden_def(name) hidden_def (name) | |
51 | # define libc_hidden_weak(name) hidden_weak (name) | |
52 | -# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version) | |
53 | +# define libc_hidden_nolink(name, version) hidden_def (name) | |
54 | # define libc_hidden_ver(local, name) hidden_ver (local, name) | |
55 | # define libc_hidden_data_def(name) hidden_data_def (name) | |
56 | # define libc_hidden_data_weak(name) hidden_data_weak (name) |