/[pkg-glibc]/glibc-package/branches/glibc-2.19/debian/patches/any/local-libpic.diff
ViewVC logotype

Contents of /glibc-package/branches/glibc-2.19/debian/patches/any/local-libpic.diff

Parent Directory Parent Directory | Revision Log Revision Log


Revision 6097 - (show annotations) (download)
Wed May 21 12:40:56 2014 UTC (5 months ago) by aurel32
File size: 3674 byte(s)
patches/any/local-libpic.diff: new patch from eglibc tree to install
*_pic.a files.
1 --- a/Makerules
2 +++ b/Makerules
3 @@ -610,6 +629,9 @@
4 $(common-objpfx)libc.so: $(common-objpfx)libc.map
5 endif
6 common-generated += libc.so libc_pic.os
7 +ifndef subdir
8 +install-extras := soinit.o sofini.o
9 +endif
10 ifdef libc.so-version
11 $(common-objpfx)libc.so$(libc.so-version): $(common-objpfx)libc.so
12 $(make-link)
13 @@ -832,6 +854,7 @@
14 installed-libcs := $(foreach o,$(filter-out .os,$(object-suffixes-for-libc)),\
15 $(inst_libdir)/$(patsubst %,$(libtype$o),\
16 $(libprefix)$(libc-name)))
17 +installed-libcs := $(installed-libcs) $(inst_libdir)/libc_pic.a
18 install: $(installed-libcs)
19 $(installed-libcs): $(inst_libdir)/lib$(libprefix)%: lib $(+force)
20 $(make-target-directory)
21 @@ -860,6 +883,22 @@
22 install-lib.so-versioned := $(filter $(versioned), $(install-lib.so))
23 install-lib.so-unversioned := $(filter-out $(versioned), $(install-lib.so))
24
25 +# Install the _pic.a files for versioned libraries, and corresponding
26 +# .map files.
27 +# libpthread_pic.a breaks mklibs, so don't install it and its map.
28 +install-lib := $(install-lib) $(install-lib.so-versioned:%.so=%_pic.a)
29 +install-lib := $(filter-out libpthread_pic.a,$(install-lib))
30 +# Despite having a soname libhurduser and libmachuser do not use symbol
31 +# versioning, so don't install the corresponding .map files.
32 +ifeq ($(build-shared),yes)
33 +install-map := $(patsubst %.so,%.map,\
34 + $(foreach L,$(install-lib.so-versioned),$(notdir $L)))
35 +install-map := $(filter-out libhurduser.map libmachuser.map libpthread.map,$(install-map))
36 +ifndef subdir
37 +install-map := $(install-map) libc.map
38 +endif
39 +endif
40 +
41 # For versioned libraries, we install three files:
42 # $(inst_libdir)/libfoo.so -- for linking, symlink or ld script
43 # $(inst_slibdir)/libfoo.so.NN -- for loading by SONAME, symlink
44 @@ -1101,9 +1140,22 @@
45 endif # headers-nonh
46 endif # headers
47
48 +ifdef install-map
49 +$(addprefix $(inst_libdir)/,$(patsubst lib%.map,lib%_pic.map,$(install-map))): \
50 + $(inst_libdir)/lib%_pic.map: $(common-objpfx)lib%.map $(+force)
51 + $(do-install)
52 +endif
53 +
54 +ifdef install-extras
55 +$(addprefix $(inst_libdir)/libc_pic/,$(install-extras)): \
56 + $(inst_libdir)/libc_pic/%.o: $(elfobjdir)/%.os $(+force)
57 + $(do-install)
58 +endif
59 +
60 .PHONY: install-bin-nosubdir install-bin-script-nosubdir \
61 install-rootsbin-nosubdir install-sbin-nosubdir install-lib-nosubdir \
62 - install-data-nosubdir install-headers-nosubdir
63 + install-data-nosubdir install-headers-nosubdir install-map-nosubdir \
64 + install-extras-nosubdir
65 install-bin-nosubdir: $(addprefix $(inst_bindir)/,$(install-bin))
66 install-bin-script-nosubdir: $(addprefix $(inst_bindir)/,$(install-bin-script))
67 install-rootsbin-nosubdir: \
68 @@ -1116,6 +1168,10 @@
69 install-headers-nosubdir: $(addprefix $(inst_includedir)/,$(headers))
70 install-others-nosubdir: $(install-others)
71 install-others-programs-nosubdir: $(install-others-programs)
72 +install-map-nosubdir: $(addprefix $(inst_libdir)/,\
73 + $(patsubst lib%.map,lib%_pic.map,$(install-map)))
74 +install-extras-nosubdir: $(addprefix $(inst_libdir)/libc_pic/,\
75 + $(install-extras))
76
77 # We need all the `-nosubdir' targets so that `install' in the parent
78 # doesn't depend on several things which each iterate over the subdirs.
79 @@ -1125,7 +1181,8 @@
80
81 .PHONY: install install-no-libc.a-nosubdir
82 install-no-libc.a-nosubdir: install-headers-nosubdir install-data-nosubdir \
83 - install-lib-nosubdir install-others-nosubdir
84 + install-lib-nosubdir install-others-nosubdir \
85 + install-map-nosubdir install-extras-nosubdir
86 ifeq ($(build-programs),yes)
87 install-no-libc.a-nosubdir: install-bin-nosubdir install-bin-script-nosubdir \
88 install-rootsbin-nosubdir install-sbin-nosubdir \
89

  ViewVC Help
Powered by ViewVC 1.1.5