r5329 - in glibc-package/branches/eglibc-2.16/debian: . control.in debhelper.in patches patches/any sysdeps
Author: adconrad
Date: 2012-10-25 13:15:30 +0000 (Thu, 25 Oct 2012)
New Revision: 5329
Added:
glibc-package/branches/eglibc-2.16/debian/pldd.1
Removed:
glibc-package/branches/eglibc-2.16/debian/patches/any/cvs-malloc-arena.diff
Modified:
glibc-package/branches/eglibc-2.16/debian/changelog
glibc-package/branches/eglibc-2.16/debian/control
glibc-package/branches/eglibc-2.16/debian/control.in/main
glibc-package/branches/eglibc-2.16/debian/debhelper.in/libc-bin.install
glibc-package/branches/eglibc-2.16/debian/debhelper.in/libc-bin.manpages
glibc-package/branches/eglibc-2.16/debian/debhelper.in/libc-dev-bin.install
glibc-package/branches/eglibc-2.16/debian/patches/series
glibc-package/branches/eglibc-2.16/debian/sysdeps/amd64.mk
glibc-package/branches/eglibc-2.16/debian/sysdeps/i386.mk
glibc-package/branches/eglibc-2.16/debian/sysdeps/x32.mk
Log:
Disable x32 builds for now, and tweak various bits along the way; add pldd.1 manpage
Modified: glibc-package/branches/eglibc-2.16/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/changelog 2012-10-25 13:12:21 UTC (rev 5328)
+++ glibc-package/branches/eglibc-2.16/debian/changelog 2012-10-25 13:15:30 UTC (rev 5329)
@@ -322,6 +322,19 @@
* debian/rules: Expand clean target to remove several autogenerated files
under debian/ that weren't getting removed.
+ [ Adam Conrad ]
+ * debian/debhelper.in/{libc-bin.install,libc-dev-bin.install}: install
+ sotruss binary to libc-dev-bin instead of libc-bin.
+ * debian/sysdeps/{i386,amd64,x32}.mk: Don't set MIN_KERNEL_SUPPORTED
+ explicitly, as this will cause serious upgrade headaches, and there's
+ no guarantee that a 3.4.0 kernel actually has x32 support built in.
+ * debian/control.in/main: Bump the linux-libc-dev build-dep to (>= 3.4)
+ on all linux-any architectures, not just amd64, i386, and x32.
+ * debian/debhelper.in/libc-bin.manpages: Add a pldd(1) manpage.
+ * Drop patches/any/cvs-malloc-arena.diff, included in our new upstream.
+ * debian/sysdeps/{i386,amd64}.mk: Comment out x32 multilib builds until
+ we've reached a consensus about bootstrapping this into the archive.
+
-- Aurelien Jarno <aurel32@debian.org> Wed, 25 Jul 2012 23:45:58 +0200
eglibc (2.13-35) unstable; urgency=low
Modified: glibc-package/branches/eglibc-2.16/debian/control
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/control 2012-10-25 13:12:21 UTC (rev 5328)
+++ glibc-package/branches/eglibc-2.16/debian/control 2012-10-25 13:15:30 UTC (rev 5329)
@@ -3,7 +3,7 @@
Priority: required
Build-Depends: gettext, make (>= 3.80), dpkg-dev (>= 1.16.0), bzip2, xz-utils, file, quilt,
autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 7.4.3), tar (>= 1.22), fdupes,
- linux-libc-dev (>= 3.2.1) [linux-any], linux-libc-dev (>= 3.4) [amd64 i386 x32],
+ linux-libc-dev (>= 3.4) [linux-any],
libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-dev [linux-any],
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20120520-2~) [hurd-i386], gnumach-dev [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-any],
Modified: glibc-package/branches/eglibc-2.16/debian/control.in/main
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/control.in/main 2012-10-25 13:12:21 UTC (rev 5328)
+++ glibc-package/branches/eglibc-2.16/debian/control.in/main 2012-10-25 13:15:30 UTC (rev 5329)
@@ -3,7 +3,7 @@
Priority: required
Build-Depends: gettext, make (>= 3.80), dpkg-dev (>= 1.16.0), bzip2, xz-utils, file, quilt,
autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 7.4.3), tar (>= 1.22), fdupes,
- linux-libc-dev (>= 3.2.1) [linux-any], linux-libc-dev (>= 3.4) [amd64 i386 x32],
+ linux-libc-dev (>= 3.4) [linux-any],
libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-dev [linux-any],
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20120520-2~) [hurd-i386], gnumach-dev [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-any],
Modified: glibc-package/branches/eglibc-2.16/debian/debhelper.in/libc-bin.install
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/debhelper.in/libc-bin.install 2012-10-25 13:12:21 UTC (rev 5328)
+++ glibc-package/branches/eglibc-2.16/debian/debhelper.in/libc-bin.install 2012-10-25 13:15:30 UTC (rev 5329)
@@ -12,7 +12,6 @@
debian/tmp-libc/usr/bin/localedef usr/bin
debian/tmp-libc/usr/bin/locale usr/bin
debian/tmp-libc/usr/bin/pldd usr/bin
-debian/tmp-libc/usr/bin/sotruss usr/bin
debian/tmp-libc/usr/bin/tzselect usr/bin
debian/tmp-libc/usr/lib/pt_chown usr/lib
debian/tmp-libc/usr/sbin/iconvconfig usr/sbin
Modified: glibc-package/branches/eglibc-2.16/debian/debhelper.in/libc-bin.manpages
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/debhelper.in/libc-bin.manpages 2012-10-25 13:12:21 UTC (rev 5328)
+++ glibc-package/branches/eglibc-2.16/debian/debhelper.in/libc-bin.manpages 2012-10-25 13:15:30 UTC (rev 5329)
@@ -7,6 +7,7 @@
debian/local/manpages/ldd.1
debian/local/manpages/locale.1
debian/local/manpages/localedef.1
+debian/local/manpages/pldd.1
debian/local/manpages/tzselect.1
debian/local/manpages/zdump.1
debian/local/manpages/zic.8
Modified: glibc-package/branches/eglibc-2.16/debian/debhelper.in/libc-dev-bin.install
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/debhelper.in/libc-dev-bin.install 2012-10-25 13:12:21 UTC (rev 5328)
+++ glibc-package/branches/eglibc-2.16/debian/debhelper.in/libc-dev-bin.install 2012-10-25 13:15:30 UTC (rev 5329)
@@ -1,4 +1,5 @@
debian/tmp-libc/usr/bin/gencat usr/bin
debian/tmp-libc/usr/bin/mtrace usr/bin
debian/tmp-libc/usr/bin/rpcgen usr/bin
+debian/tmp-libc/usr/bin/sotruss usr/bin
debian/tmp-libc/usr/bin/sprof usr/bin
Deleted: glibc-package/branches/eglibc-2.16/debian/patches/any/cvs-malloc-arena.diff
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/patches/any/cvs-malloc-arena.diff 2012-10-25 13:12:21 UTC (rev 5328)
+++ glibc-package/branches/eglibc-2.16/debian/patches/any/cvs-malloc-arena.diff 2012-10-25 13:15:30 UTC (rev 5329)
@@ -1,33 +0,0 @@
-2012-09-08 H.J. Lu <hongjiu.lu@intel.com>
-
- [BZ #14562]
- * malloc/arena.c (heap_trim): Properly get fencepost and adjust
- new chunk size with MALLOC_ALIGN_MASK.
-
----
- malloc/arena.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
---- a/malloc/arena.c
-+++ b/malloc/arena.c
-@@ -652,15 +652,18 @@
- unsigned long pagesz = GLRO(dl_pagesize);
- mchunkptr top_chunk = top(ar_ptr), p, bck, fwd;
- heap_info *prev_heap;
-- long new_size, top_size, extra;
-+ long new_size, top_size, extra, misalign;
-
- /* Can this heap go away completely? */
- while(top_chunk == chunk_at_offset(heap, sizeof(*heap))) {
- prev_heap = heap->prev;
- p = chunk_at_offset(prev_heap, prev_heap->size - (MINSIZE-2*SIZE_SZ));
-+ /* fencepost must be properly aligned. */
-+ misalign = ((long) p) & MALLOC_ALIGN_MASK;
-+ p = (mchunkptr)(((unsigned long) p) & ~MALLOC_ALIGN_MASK);
- assert(p->size == (0|PREV_INUSE)); /* must be fencepost */
- p = prev_chunk(p);
-- new_size = chunksize(p) + (MINSIZE-2*SIZE_SZ);
-+ new_size = chunksize(p) + (MINSIZE-2*SIZE_SZ) + misalign;
- assert(new_size>0 && new_size<(long)(2*MINSIZE));
- if(!prev_inuse(p))
- new_size += p->prev_size;
Modified: glibc-package/branches/eglibc-2.16/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/patches/series 2012-10-25 13:12:21 UTC (rev 5328)
+++ glibc-package/branches/eglibc-2.16/debian/patches/series 2012-10-25 13:15:30 UTC (rev 5329)
@@ -224,4 +224,3 @@
any/submitted-resolv-first-query-failure.diff
any/local-revert-fclose-posix2008.diff
any/local-disable-libnss-db.diff
-any/cvs-malloc-arena.diff
Added: glibc-package/branches/eglibc-2.16/debian/pldd.1
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/pldd.1 (rev 0)
+++ glibc-package/branches/eglibc-2.16/debian/pldd.1 2012-10-25 13:15:30 UTC (rev 5329)
@@ -0,0 +1,27 @@
+.\" Do not restrict distribution.
+.\" May be distributed under the GNU General Public License
+.TH PLDD 1 "11 January 2012"
+.SH NAME
+pldd \- list dynamic shared objects loaded into process
+.SH SYNOPSIS
+.B pldd
+.RB [OPTION]...
+PID
+.SH DESCRIPTION
+.B pldd
+lists the dynamic shared objects loaded into a process.
+.SH OPTIONS
+.TP
+.B \-\-usage
+Give a short usage message.
+.TP
+.B \-V\ \-\-version
+Print the version number of
+.BR pldd .
+.TP
+.B \-?\ \-\-help
+Usage information.
+.SH AUTHOR
+Ulrich Drepper.
+.SH SEE ALSO
+.BR ldd (8).
Modified: glibc-package/branches/eglibc-2.16/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/sysdeps/amd64.mk 2012-10-25 13:12:21 UTC (rev 5328)
+++ glibc-package/branches/eglibc-2.16/debian/sysdeps/amd64.mk 2012-10-25 13:15:30 UTC (rev 5329)
@@ -1,4 +1,3 @@
-libc_MIN_KERNEL_SUPPORTED = 3.4.0
libc_rtlddir = /lib64
extra_config_options = --enable-multi-arch
@@ -38,23 +37,23 @@
ln -sf /lib32/ld-linux.so.2 debian/libc6-i386/lib
endef
-# build x32 ABI alternative library
-EGLIBC_PASSES += x32
-DEB_ARCH_REGULAR_PACKAGES += libc6-x32 libc6-dev-x32
-libc6-x32_shlib_dep = libc6-x32 (>= $(shlib_dep_ver))
-x32_add-ons = nptl $(add-ons)
-x32_configure_target = x86_64-linux-gnux32
-x32_CC = gcc-4.7 -mx32
-x32_CXX = g++-4.7 -mx32
-x32_extra_config_options = $(extra_config_options) --disable-profile
-x32_slibdir = /libx32
-x32_libdir = /usr/libx32
+## build x32 ABI alternative library
+#EGLIBC_PASSES += x32
+#DEB_ARCH_REGULAR_PACKAGES += libc6-x32 libc6-dev-x32
+#libc6-x32_shlib_dep = libc6-x32 (>= $(shlib_dep_ver))
+#x32_add-ons = nptl $(add-ons)
+#x32_configure_target = x86_64-linux-gnux32
+#x32_CC = gcc-4.7 -mx32
+#x32_CXX = g++-4.7 -mx32
+#x32_extra_config_options = $(extra_config_options) --disable-profile
+#x32_slibdir = /libx32
+#x32_libdir = /usr/libx32
+#
+#define libc6-dev-x32_extra_pkg_install
+#
+#mkdir -p debian/libc6-dev-x32/usr/include/x86_64-linux-gnu/gnu
+#cp -a debian/tmp-x32/usr/include/gnu/stubs-x32.h \
+# debian/libc6-dev-x32/usr/include/x86_64-linux-gnu/gnu
+#
+#endef
-define libc6-dev-x32_extra_pkg_install
-
-mkdir -p debian/libc6-dev-x32/usr/include/x86_64-linux-gnu/gnu
-cp -a debian/tmp-x32/usr/include/gnu/stubs-x32.h \
- debian/libc6-dev-x32/usr/include/x86_64-linux-gnu/gnu
-
-endef
-
Modified: glibc-package/branches/eglibc-2.16/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/sysdeps/i386.mk 2012-10-25 13:12:21 UTC (rev 5328)
+++ glibc-package/branches/eglibc-2.16/debian/sysdeps/i386.mk 2012-10-25 13:15:30 UTC (rev 5329)
@@ -1,4 +1,3 @@
-libc_MIN_KERNEL_SUPPORTED = 3.4.0
extra_config_options = --enable-multi-arch
# We use -march=i686 and glibc's i686 routines use cmov, so require it.
@@ -76,22 +75,22 @@
endef
-# build x32 ABI alternative library
-EGLIBC_PASSES += x32
-DEB_ARCH_REGULAR_PACKAGES += libc6-x32 libc6-dev-x32
-libc6-x32_shlib_dep = libc6-x32 (>= $(shlib_dep_ver))
-x32_add-ons = nptl $(add-ons)
-x32_configure_target = x86_64-linux-gnux32
-x32_CC = gcc-4.7 -mx32
-x32_CXX = g++-4.7 -mx32
-x32_extra_config_options = $(extra_config_options) --disable-profile
-x32_slibdir = /libx32
-x32_libdir = /usr/libx32
-
-define libc6-dev-x32_extra_pkg_install
-
-mkdir -p debian/libc6-dev-x32/usr/include/i386-linux-gnu/gnu
-cp -a debian/tmp-x32/usr/include/gnu/stubs-x32.h \
- debian/libc6-dev-x32/usr/include/i386-linux-gnu/gnu
-
-endef
+## build x32 ABI alternative library
+#EGLIBC_PASSES += x32
+#DEB_ARCH_REGULAR_PACKAGES += libc6-x32 libc6-dev-x32
+#libc6-x32_shlib_dep = libc6-x32 (>= $(shlib_dep_ver))
+#x32_add-ons = nptl $(add-ons)
+#x32_configure_target = x86_64-linux-gnux32
+#x32_CC = gcc-4.7 -mx32
+#x32_CXX = g++-4.7 -mx32
+#x32_extra_config_options = $(extra_config_options) --disable-profile
+#x32_slibdir = /libx32
+#x32_libdir = /usr/libx32
+#
+#define libc6-dev-x32_extra_pkg_install
+#
+#mkdir -p debian/libc6-dev-x32/usr/include/i386-linux-gnu/gnu
+#cp -a debian/tmp-x32/usr/include/gnu/stubs-x32.h \
+# debian/libc6-dev-x32/usr/include/i386-linux-gnu/gnu
+#
+#endef
Modified: glibc-package/branches/eglibc-2.16/debian/sysdeps/x32.mk
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/sysdeps/x32.mk 2012-10-25 13:12:21 UTC (rev 5328)
+++ glibc-package/branches/eglibc-2.16/debian/sysdeps/x32.mk 2012-10-25 13:15:30 UTC (rev 5329)
@@ -1,4 +1,3 @@
-libc_MIN_KERNEL_SUPPORTED = 3.4.0
libc_rtlddir = /libx32
extra_config_options = --enable-multi-arch
Reply to: