r893 - in glibc-package/branches/glibc-2.3.4/debian: . patches
Author: gotom
Date: 2005-04-16 16:16:09 +0000 (Sat, 16 Apr 2005)
New Revision: 893
Modified:
glibc-package/branches/glibc-2.3.4/debian/changelog
glibc-package/branches/glibc-2.3.4/debian/patches/linuxthreads-sizefix.dpatch
Log:
* Update linuxthreads size fix for not only ia64, but also alpha,
amd64, i386, powerpc, s390, sh and sparc.
- debian/patches/linuxthreads-sizefix.dpatch: Update.
Note that the patch change is also suddenly merged into r890.
Modified: glibc-package/branches/glibc-2.3.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/changelog 2005-04-16 14:18:59 UTC (rev 892)
+++ glibc-package/branches/glibc-2.3.4/debian/changelog 2005-04-16 16:16:09 UTC (rev 893)
@@ -22,6 +22,10 @@
- debian/debhelper.in/libc.preinst: Add export LC_ALL=C.
- debian/patches/00list: Update.
+ * Update linuxthreads size fix for not only ia64, but also alpha,
+ amd64, i386, powerpc, s390, sh and sparc.
+ - debian/patches/linuxthreads-sizefix.dpatch: Update.
+
-- GOTO Masanori <gotom@debian.org> Sun, 10 Apr 2005 14:02:19 +0900
glibc (2.3.4-3) experimental; urgency=low
@@ -40,6 +44,8 @@
- debian/debhelper.in/libc-otherbuild.postrm: When it's removed,
check /etc/ld.so.hwcappkgs and search other hwcap package's version
consistency. Then it decides to remove /etc/ld.so.nohwcap.
+ - debian/debhelper.in/libc.postrm: Leave /etc/ld.so.nohwcap if it's
+ downgrade to hwcappkgs incompatible version.
- debian/rules.d/debhelper.mk: Include "libc-" into OPT string
replacement.
Modified: glibc-package/branches/glibc-2.3.4/debian/patches/linuxthreads-sizefix.dpatch
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/patches/linuxthreads-sizefix.dpatch 2005-04-16 14:18:59 UTC (rev 892)
+++ glibc-package/branches/glibc-2.3.4/debian/patches/linuxthreads-sizefix.dpatch 2005-04-16 16:16:09 UTC (rev 893)
@@ -346,11 +346,11 @@
/* Alignment requirements for the TCB. */
# define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct)
---- glibc-2.3.2-net/nptl/Makefile 4 Oct 2003 11:53:45 -0000 1.1.1.67
-+++ glibc-2.3.2-redhat/nptl/Makefile 4 Oct 2003 12:06:23 -0000 1.72
-@@ -465,15 +465,19 @@ $(addprefix $(objpfx), \
- $(tests) $(test-srcs))): $(objpfx)libpthread.so \
- $(objpfx)libpthread_nonshared.a
+--- glibc-2.3.2/nptl/Makefile 2005-04-16 23:01:34.000000000 +0900
++++ glibc-2.3.2-gotom/nptl/Makefile 2005-04-16 23:03:14.000000000 +0900
+@@ -499,15 +499,19 @@
+ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
+ $(objpfx)libpthread_nonshared.a
$(objpfx)tst-unload: $(common-objpfx)dlfcn/libdl.so
-# $(objpfx)../libc.so is used instead of $(common-objpfx)libc.so,
+# $(objpfx)linklibc.so is used instead of $(common-objpfx)libc.so,
@@ -360,7 +360,7 @@
+ $(objpfx)linklibc.so $(objpfx)libpthread.so \
$(objpfx)libpthread_nonshared.a
$(objpfx)../libc.so: $(common-objpfx)libc.so ;
- $(addprefix $(objpfx),$(tests-static)): $(objpfx)libpthread.a
+ $(addprefix $(objpfx),$(tests-static) $(xtests-static)): $(objpfx)libpthread.a
$(objpfx)tst-atfork2.out: $(objpfx)tst-atfork2mod.so
+
Reply to: