r6097 - in glibc-package/branches/glibc-2.19/debian: . patches patches/any
Author: aurel32
Date: 2014-05-21 12:40:56 +0000 (Wed, 21 May 2014)
New Revision: 6097
Added:
glibc-package/branches/glibc-2.19/debian/patches/any/local-libpic.diff
Modified:
glibc-package/branches/glibc-2.19/debian/changelog
glibc-package/branches/glibc-2.19/debian/patches/series
Log:
patches/any/local-libpic.diff: new patch from eglibc tree to install
*_pic.a files.
Modified: glibc-package/branches/glibc-2.19/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.19/debian/changelog 2014-05-21 12:00:44 UTC (rev 6096)
+++ glibc-package/branches/glibc-2.19/debian/changelog 2014-05-21 12:40:56 UTC (rev 6097)
@@ -23,6 +23,8 @@
tree to workaround dcbz issues on PowerPC 8XX CPUs.
- patches/sh4/local-fpscr_values.diff: new patch from eglibc tree to
export the ___fpscr_values symbol on SH4.
+ - patches/any/local-libpic.diff: new patch from eglibc tree to install
+ *_pic.a files.
-- Aurelien Jarno <aurel32@debian.org> Wed, 21 May 2014 12:38:51 +0200
Added: glibc-package/branches/glibc-2.19/debian/patches/any/local-libpic.diff
===================================================================
--- glibc-package/branches/glibc-2.19/debian/patches/any/local-libpic.diff (rev 0)
+++ glibc-package/branches/glibc-2.19/debian/patches/any/local-libpic.diff 2014-05-21 12:40:56 UTC (rev 6097)
@@ -0,0 +1,89 @@
+--- a/Makerules
++++ b/Makerules
+@@ -610,6 +629,9 @@
+ $(common-objpfx)libc.so: $(common-objpfx)libc.map
+ endif
+ common-generated += libc.so libc_pic.os
++ifndef subdir
++install-extras := soinit.o sofini.o
++endif
+ ifdef libc.so-version
+ $(common-objpfx)libc.so$(libc.so-version): $(common-objpfx)libc.so
+ $(make-link)
+@@ -832,6 +854,7 @@
+ installed-libcs := $(foreach o,$(filter-out .os,$(object-suffixes-for-libc)),\
+ $(inst_libdir)/$(patsubst %,$(libtype$o),\
+ $(libprefix)$(libc-name)))
++installed-libcs := $(installed-libcs) $(inst_libdir)/libc_pic.a
+ install: $(installed-libcs)
+ $(installed-libcs): $(inst_libdir)/lib$(libprefix)%: lib $(+force)
+ $(make-target-directory)
+@@ -860,6 +883,22 @@
+ install-lib.so-versioned := $(filter $(versioned), $(install-lib.so))
+ install-lib.so-unversioned := $(filter-out $(versioned), $(install-lib.so))
+
++# Install the _pic.a files for versioned libraries, and corresponding
++# .map files.
++# libpthread_pic.a breaks mklibs, so don't install it and its map.
++install-lib := $(install-lib) $(install-lib.so-versioned:%.so=%_pic.a)
++install-lib := $(filter-out libpthread_pic.a,$(install-lib))
++# Despite having a soname libhurduser and libmachuser do not use symbol
++# versioning, so don't install the corresponding .map files.
++ifeq ($(build-shared),yes)
++install-map := $(patsubst %.so,%.map,\
++ $(foreach L,$(install-lib.so-versioned),$(notdir $L)))
++install-map := $(filter-out libhurduser.map libmachuser.map libpthread.map,$(install-map))
++ifndef subdir
++install-map := $(install-map) libc.map
++endif
++endif
++
+ # For versioned libraries, we install three files:
+ # $(inst_libdir)/libfoo.so -- for linking, symlink or ld script
+ # $(inst_slibdir)/libfoo.so.NN -- for loading by SONAME, symlink
+@@ -1101,9 +1140,22 @@
+ endif # headers-nonh
+ endif # headers
+
++ifdef install-map
++$(addprefix $(inst_libdir)/,$(patsubst lib%.map,lib%_pic.map,$(install-map))): \
++ $(inst_libdir)/lib%_pic.map: $(common-objpfx)lib%.map $(+force)
++ $(do-install)
++endif
++
++ifdef install-extras
++$(addprefix $(inst_libdir)/libc_pic/,$(install-extras)): \
++ $(inst_libdir)/libc_pic/%.o: $(elfobjdir)/%.os $(+force)
++ $(do-install)
++endif
++
+ .PHONY: install-bin-nosubdir install-bin-script-nosubdir \
+ install-rootsbin-nosubdir install-sbin-nosubdir install-lib-nosubdir \
+- install-data-nosubdir install-headers-nosubdir
++ install-data-nosubdir install-headers-nosubdir install-map-nosubdir \
++ install-extras-nosubdir
+ install-bin-nosubdir: $(addprefix $(inst_bindir)/,$(install-bin))
+ install-bin-script-nosubdir: $(addprefix $(inst_bindir)/,$(install-bin-script))
+ install-rootsbin-nosubdir: \
+@@ -1116,6 +1168,10 @@
+ install-headers-nosubdir: $(addprefix $(inst_includedir)/,$(headers))
+ install-others-nosubdir: $(install-others)
+ install-others-programs-nosubdir: $(install-others-programs)
++install-map-nosubdir: $(addprefix $(inst_libdir)/,\
++ $(patsubst lib%.map,lib%_pic.map,$(install-map)))
++install-extras-nosubdir: $(addprefix $(inst_libdir)/libc_pic/,\
++ $(install-extras))
+
+ # We need all the `-nosubdir' targets so that `install' in the parent
+ # doesn't depend on several things which each iterate over the subdirs.
+@@ -1125,7 +1181,8 @@
+
+ .PHONY: install install-no-libc.a-nosubdir
+ install-no-libc.a-nosubdir: install-headers-nosubdir install-data-nosubdir \
+- install-lib-nosubdir install-others-nosubdir
++ install-lib-nosubdir install-others-nosubdir \
++ install-map-nosubdir install-extras-nosubdir
+ ifeq ($(build-programs),yes)
+ install-no-libc.a-nosubdir: install-bin-nosubdir install-bin-script-nosubdir \
+ install-rootsbin-nosubdir install-sbin-nosubdir \
+
Modified: glibc-package/branches/glibc-2.19/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.19/debian/patches/series 2014-05-21 12:00:44 UTC (rev 6096)
+++ glibc-package/branches/glibc-2.19/debian/patches/series 2014-05-21 12:40:56 UTC (rev 6097)
@@ -247,3 +247,4 @@
any/submitted-nl_langinfo-static.diff
any/cvs-strtod.diff
any/local-dynamic-resolvconf.diff
+any/local-libpic.diff
Reply to: