Author: aurel32
Date: 2011-02-26 17:28:52 +0000 (Sat, 26 Feb 2011)
New Revision: 4543
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/any/local-rtld.diff
glibc-package/trunk/debian/rules
glibc-package/trunk/debian/rules.d/build.mk
glibc-package/trunk/debian/rules.d/debhelper.mk
glibc-package/trunk/debian/sysdeps/alpha.mk
glibc-package/trunk/debian/sysdeps/amd64.mk
glibc-package/trunk/debian/sysdeps/hurd-i386.mk
glibc-package/trunk/debian/sysdeps/i386.mk
glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk
glibc-package/trunk/debian/sysdeps/kfreebsd-i386.mk
glibc-package/trunk/debian/sysdeps/mips.mk
glibc-package/trunk/debian/sysdeps/mipsel.mk
glibc-package/trunk/debian/sysdeps/powerpc.mk
glibc-package/trunk/debian/sysdeps/ppc64.mk
glibc-package/trunk/debian/sysdeps/s390.mk
glibc-package/trunk/debian/sysdeps/sparc.mk
glibc-package/trunk/debian/sysdeps/sparc64.mk
Log:
[ Steve Langasek ]
* Merge parts of multiarch patch:
- Use the correct path in the ldd script as well
- Set default rtlddir to /lib and override it when needed.
- Install xen library in $(libdir)/xen instead of /usr/lib/xen.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-02-26 17:10:17 UTC (rev
4542)
+++ glibc-package/trunk/debian/changelog 2011-02-26 17:28:52 UTC (rev
4543)
@@ -19,8 +19,14 @@
* Patch from Nobuhiro Iwamatsu to cope with the removal of
patch --unified-reject-files. closes: #612540.
- -- Clint Adams <cl...@debian.org> Tue, 08 Feb 2011 22:29:28 -0500
+ [ Steve Langasek ]
+ * Merge parts of multiarch patch:
+ - Use the correct path in the ldd script as well
+ - Set default rtlddir to /lib and override it when needed.
+ - Install xen library in $(libdir)/xen instead of /usr/lib/xen.
+ -- Aurelien Jarno <aure...@debian.org> Sat, 26 Feb 2011 18:24:24 +0100
+
eglibc (2.11.2-11) unstable; urgency=low
* patches/kfreebsd/local-sysdeps.diff: remove stub marks for at*
Modified: glibc-package/trunk/debian/patches/any/local-rtld.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-rtld.diff 2011-02-26
17:10:17 UTC (rev 4542)
+++ glibc-package/trunk/debian/patches/any/local-rtld.diff 2011-02-26
17:28:52 UTC (rev 4543)
@@ -1,3 +1,6 @@
+2011-02-08 Steve Langasek <steve.langa...@ubuntu.com>
+ * elf/Makefile: use the correct path in the ldd script as well
+
2006-01-21 Aurelien Jarno <aure...@debian.org>
* Makeconfig: new configuration variable rtlddir to change the
@@ -14,7 +17,7 @@
--- a/Makeconfig
+++ b/Makeconfig
-@@ -212,6 +212,11 @@
+@@ -202,6 +202,11 @@
endif
inst_slibdir = $(install_root)$(slibdir)
@@ -26,7 +29,7 @@
# Prefix to put on files installed in $(libdir). For libraries `libNAME.a',
# the prefix is spliced between `lib' and the name, so the linker switch
# `-l$(libprefix)NAME' finds the library; for other files the prefix is
-@@ -488,7 +493,7 @@
+@@ -486,7 +491,7 @@
endif
ifndef config-LDFLAGS
ifeq (yesyes,$(build-shared)$(elf))
@@ -46,3 +49,12 @@
-DNOT_IN_libc=1
$(objpfx)interp.os: $(common-objpfx)config.make
+@@ -423,7 +423,7 @@
+ endif
+
+
+-common-ldd-rewrite = -e 's%@RTLD@%$(slibdir)/$(rtld-installed-name)%g' \
++common-ldd-rewrite = -e 's%@RTLD@%$(rltddir)/$(rtld-installed-name)%g' \
+ -e 's%@VERSION@%$(version)%g' \
+ -e 's%@PKGVERSION@%$(PKGVERSION)%g' \
+ -e 's%@REPORT_BUGS_TO@%$(REPORT_BUGS_TO)%g'
Modified: glibc-package/trunk/debian/rules
===================================================================
--- glibc-package/trunk/debian/rules 2011-02-26 17:10:17 UTC (rev 4542)
+++ glibc-package/trunk/debian/rules 2011-02-26 17:28:52 UTC (rev 4543)
@@ -89,6 +89,7 @@
docdir=$(prefix)/share/doc
mandir=$(prefix)/share/man
sbindir=$(prefix)/sbin
+rtlddir=/lib
slibdir=/lib
libdir=/usr/lib
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2011-02-26 17:10:17 UTC (rev
4542)
+++ glibc-package/trunk/debian/rules.d/build.mk 2011-02-26 17:28:52 UTC (rev
4543)
@@ -47,9 +47,7 @@
echo "sbindir = $(sbindir)" >> $(DEB_BUILDDIR)/configparms
echo "libdir = $(call xx,libdir)" >> $(DEB_BUILDDIR)/configparms
echo "slibdir = $(call xx,slibdir)" >> $(DEB_BUILDDIR)/configparms
- rtlddir="$(call xx,rtlddir)" ; if test -n "$$rtlddir" ; then \
- echo "rtlddir = $$rtlddir" >> $(DEB_BUILDDIR)/configparms ; \
- fi
+ echo "rtlddir = $(call xx,rtlddir)" >> $(DEB_BUILDDIR)/configparms
# Prevent autoconf from running unexpectedly by setting it to false.
# Also explicitly pass CC down - this is needed to get -m64 on
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2011-02-26 17:10:17 UTC
(rev 4542)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2011-02-26 17:28:52 UTC
(rev 4543)
@@ -213,6 +213,7 @@
cp $$s $$t ; \
fi ; \
sed -e "s#TMPDIR#debian/tmp-$$curpass#g" -i $$t; \
+ sed -e "s#RTLDDIR#$$rtlddir#g" -i $$t; \
sed -e "s#SLIBDIR#$$slibdir#g" -i $$t; \
sed -e "s#LIBDIR#$$libdir#g" -i $$t; \
sed -e "s#FLAVOR#$$curpass#g" -i $$t; \
Modified: glibc-package/trunk/debian/sysdeps/alpha.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/alpha.mk 2011-02-26 17:10:17 UTC (rev
4542)
+++ glibc-package/trunk/debian/sysdeps/alpha.mk 2011-02-26 17:28:52 UTC (rev
4543)
@@ -10,5 +10,4 @@
alphaev67_configure_target = alphaev67-linux-gnu
alphaev67_extra_cflags = -mcpu=ev67 -mtune=ev67 -O2
alphaev67_extra_config_options = $(extra_config_options) --disable-profile
-alphaev67_rtlddir = /lib
alphaev67_slibdir = /lib/ev67
Modified: glibc-package/trunk/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/amd64.mk 2011-02-26 17:10:17 UTC (rev
4542)
+++ glibc-package/trunk/debian/sysdeps/amd64.mk 2011-02-26 17:28:52 UTC (rev
4543)
@@ -18,7 +18,6 @@
i386_extra_cflags = -march=pentium4 -mtune=generic
i386_extra_config_options = $(extra_config_options)
i386_includedir = /usr/include/i486-linux-gnu
-i386_rtlddir = /lib
i386_slibdir = /lib32
i386_libdir = /usr/lib32
Modified: glibc-package/trunk/debian/sysdeps/hurd-i386.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/hurd-i386.mk 2011-02-26 17:10:17 UTC
(rev 4542)
+++ glibc-package/trunk/debian/sysdeps/hurd-i386.mk 2011-02-26 17:28:52 UTC
(rev 4543)
@@ -5,7 +5,6 @@
i686_add-ons = $(add-ons)
i686_configure_target=i686-gnu
i686_extra_cflags = -march=i686 -mtune=generic
-i686_rtlddir = /lib
i686_slibdir = /lib/i686/cmov
i686_extra_config_options = $(extra_config_options) --disable-profile
--disable-compatible-utmp
@@ -16,13 +15,12 @@
xen_add-ons = $(add-ons)
xen_configure_target=i686-gnu
xen_extra_cflags = -march=i686 -mtune=generic -mno-tls-direct-seg-refs
-xen_rtlddir = /lib
xen_slibdir = /lib/i686/nosegneg
xen_extra_config_options = $(extra_config_options) --disable-profile
define libc0.3-dev_extra_pkg_install
-mkdir -p debian/libc0.3-dev/usr/lib/xen
-cp -af debian/tmp-xen/usr/lib/*.a \
- debian/libc0.3-dev/usr/lib/xen
+mkdir -p debian/libc0.3-dev/$(libdir)/xen
+cp -af debian/tmp-xen/$(libdir)/*.a \
+ debian/libc0.3-dev/$(libdir)/xen
endef
Modified: glibc-package/trunk/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/i386.mk 2011-02-26 17:10:17 UTC (rev
4542)
+++ glibc-package/trunk/debian/sysdeps/i386.mk 2011-02-26 17:28:52 UTC (rev
4543)
@@ -8,7 +8,6 @@
i686_add-ons = nptl $(add-ons)
i686_configure_target=i686-linux-gnu
i686_extra_cflags = -march=i686 -mtune=generic
-i686_rtlddir = /lib
i686_slibdir = /lib/i686/cmov
i686_extra_config_options = $(extra_config_options) --disable-profile
@@ -19,7 +18,6 @@
xen_add-ons = nptl $(add-ons)
xen_configure_target=i686-linux-gnu
xen_extra_cflags = -march=i686 -mtune=generic -mno-tls-direct-seg-refs
-xen_rtlddir = /lib
xen_slibdir = /lib/i686/nosegneg
xen_extra_config_options = $(extra_config_options) --disable-profile
@@ -44,6 +42,7 @@
amd64_CC = $(CC) -m64 -D__x86_64__
amd64_CXX = $(CXX) -m64 -D__x86_64__
amd64_extra_config_options = $(extra_config_options) --disable-profile
+amd64_rtlddir = /lib64
amd64_slibdir = /lib64
amd64_libdir = /usr/lib64
@@ -56,9 +55,9 @@
endef
define libc6-dev_extra_pkg_install
-mkdir -p debian/libc6-dev/usr/lib/xen
-cp -af debian/tmp-xen/usr/lib/*.a \
- debian/libc6-dev/usr/lib/xen
+mkdir -p debian/libc6-dev/$(libdir)/xen
+cp -af debian/tmp-xen/$(libdir)/*.a \
+ debian/libc6-dev/$(libdir)/xen
endef
define libc6-dev-amd64_extra_pkg_install
Modified: glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk 2011-02-26
17:10:17 UTC (rev 4542)
+++ glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk 2011-02-26
17:28:52 UTC (rev 4543)
@@ -1,7 +1,3 @@
-libc_slibdir = /lib
-libc_libdir = /usr/lib
-libc_rtlddir = /lib
-
# /lib64 and /usr/lib64 are provided by glibc instead base-files: #259302.
define libc0.1_extra_pkg_install
ln -sf /lib debian/$(curpass)/lib64
@@ -20,7 +16,6 @@
i386_extra_cflags = -march=pentium4 -mtune=generic
i386_extra_config_options = $(extra_config_options) --disable-compatible-utmp
i386_includedir = /usr/include/i486-kfreebsd-gnu
-i386_rtlddir = /lib
i386_slibdir = /lib32
i386_libdir = /usr/lib32
i386_MIN_KERNEL_SUPPORTED = 6.0.0
Modified: glibc-package/trunk/debian/sysdeps/kfreebsd-i386.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/kfreebsd-i386.mk 2011-02-26 17:10:17 UTC
(rev 4542)
+++ glibc-package/trunk/debian/sysdeps/kfreebsd-i386.mk 2011-02-26 17:28:52 UTC
(rev 4543)
@@ -6,6 +6,5 @@
i686_add-ons = ports linuxthreads $(add-ons)
i686_configure_target=i686-kfreebsd-gnu
i686_extra_cflags = -march=i686 -mtune=generic
-i686_rtlddir = /lib
i686_slibdir = /lib/i686/cmov
i686_extra_config_options = $(extra_config_options) --disable-profile
--disable-compatible-utmp
Modified: glibc-package/trunk/debian/sysdeps/mips.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/mips.mk 2011-02-26 17:10:17 UTC (rev
4542)
+++ glibc-package/trunk/debian/sysdeps/mips.mk 2011-02-26 17:28:52 UTC (rev
4543)
@@ -8,6 +8,7 @@
mipsn32_CC = $(CC) -mabi=n32
mipsn32_CXX = $(CXX) -mabi=n32
libc6-mipsn32_shlib_dep = libc6-mipsn32 (>= $(shlib_dep_ver))
+mipsn32_rtlddir = /lib32
mipsn32_slibdir = /lib32
mipsn32_libdir = /usr/lib32
mipsn32_extra_config_options := $(extra_config_options) --disable-profile
@@ -20,6 +21,7 @@
mips64_CC = $(CC) -mabi=64
mips64_CXX = $(CXX) -mabi=64
libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver))
+mips64_rtlddir = /lib64
mips64_slibdir = /lib64
mips64_libdir = /usr/lib64
mips64_extra_config_options := $(extra_config_options) --disable-profile
Modified: glibc-package/trunk/debian/sysdeps/mipsel.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/mipsel.mk 2011-02-26 17:10:17 UTC
(rev 4542)
+++ glibc-package/trunk/debian/sysdeps/mipsel.mk 2011-02-26 17:28:52 UTC
(rev 4543)
@@ -8,6 +8,7 @@
mipsn32_CC = $(CC) -mabi=n32
mipsn32_CXX = $(CXX) -mabi=n32
libc6-mipsn32_shlib_dep = libc6-mipsn32 (>= $(shlib_dep_ver))
+mipsn32_rtlddir = /lib32
mipsn32_slibdir = /lib32
mipsn32_libdir = /usr/lib32
mipsn32_extra_config_options := $(extra_config_options) --disable-profile
@@ -20,6 +21,7 @@
mips64_CC = $(CC) -mabi=64
mips64_CXX = $(CXX) -mabi=64
libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver))
+mips64_rtlddir = /lib64
mips64_slibdir = /lib64
mips64_libdir = /usr/lib64
mips64_extra_config_options := $(extra_config_options) --disable-profile
Modified: glibc-package/trunk/debian/sysdeps/powerpc.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/powerpc.mk 2011-02-26 17:10:17 UTC
(rev 4542)
+++ glibc-package/trunk/debian/sysdeps/powerpc.mk 2011-02-26 17:28:52 UTC
(rev 4543)
@@ -7,6 +7,7 @@
ppc64_CXX = $(CXX) -m64
libc6-ppc64_shlib_dep = libc6-ppc64 (>= $(shlib_dep_ver))
ppc64_extra_config_options := $(extra_config_options) --disable-profile
+ppc64_rtlddir = /lib64
ppc64_slibdir = /lib64
ppc64_libdir = /usr/lib64
ppc64_includedir = /usr/include/powerpc64-linux-gnu
Modified: glibc-package/trunk/debian/sysdeps/ppc64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/ppc64.mk 2011-02-26 17:10:17 UTC (rev
4542)
+++ glibc-package/trunk/debian/sysdeps/ppc64.mk 2011-02-26 17:28:52 UTC (rev
4543)
@@ -1,5 +1,3 @@
-libc_slibdir = /lib
-libc_libdir = /usr/lib
libc_rtlddir = /lib64
# /lib64 and /usr/lib64 are provided as symlinks
@@ -18,7 +16,6 @@
powerpc_CXX = $(CXX) -m32
powerpc_includedir = /usr/include/powerpc-linux-gnu
powerpc_extra_config_options := $(extra_config_options) --disable-profile
-powerpc_rtlddir = /lib
powerpc_slibdir = /lib32
powerpc_libdir = /usr/lib32
Modified: glibc-package/trunk/debian/sysdeps/s390.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/s390.mk 2011-02-26 17:10:17 UTC (rev
4542)
+++ glibc-package/trunk/debian/sysdeps/s390.mk 2011-02-26 17:28:52 UTC (rev
4543)
@@ -8,6 +8,7 @@
libc6-s390x_shlib_dep = libc6-s390x (>= $(shlib_dep_ver))
s390x_extra_config_options := $(extra_config_options) --disable-profile
s390x_includedir = /usr/include/s390x-linux-gnu
+s390x_rtlddir = /lib64
s390x_slibdir = /lib64
s390x_libdir = /usr/lib64
Modified: glibc-package/trunk/debian/sysdeps/sparc.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/sparc.mk 2011-02-26 17:10:17 UTC (rev
4542)
+++ glibc-package/trunk/debian/sysdeps/sparc.mk 2011-02-26 17:28:52 UTC (rev
4543)
@@ -6,7 +6,6 @@
sparcv9b_configure_build=sparcv9b-linux-gnu
sparcv9b_extra_cflags = -mcpu=ultrasparc3
sparcv9b_extra_config_options = $(extra_config_options) --disable-profile
-sparcv9b_rtlddir = /lib
sparcv9b_slibdir = /lib/ultra3
# build 64-bit (sparc64) alternative library
@@ -19,6 +18,7 @@
libc6-sparc64_shlib_dep = libc6-sparc64 (>= $(shlib_dep_ver))
sparc64_extra_config_options = $(extra_config_options) --disable-profile
sparc64_includedir = /usr/include/sparc64-linux-gnu
+sparc64_rtlddir = /lib64
sparc64_slibdir = /lib64
sparc64_libdir = /usr/lib64
Modified: glibc-package/trunk/debian/sysdeps/sparc64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/sparc64.mk 2011-02-26 17:10:17 UTC
(rev 4542)
+++ glibc-package/trunk/debian/sysdeps/sparc64.mk 2011-02-26 17:28:52 UTC
(rev 4543)
@@ -9,7 +9,7 @@
sparcv9b_configure_build=sparc64b-linux-gnu
sparcv9b_extra_cflags = -mcpu=ultrasparc3
sparcv9b_extra_config_options = $(extra_config_options) --disable-profile
-sparcv9b_rtlddir = /lib
+sparcv9b_rtlddir = /lib64
sparcv9b_slibdir = /lib/ultra3
# /lib64 and /usr/lib64 are provided by glibc instead base-files: #259302.
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ptnwx-00037f...@alioth.debian.org
