r1268 - in glibc-package/branches/glibc-2.4/debian: . patches rules.d sysdeps
Author: schizo
Date: 2006-03-06 20:55:01 +0000 (Mon, 06 Mar 2006)
New Revision: 1268
Added:
glibc-package/branches/glibc-2.4/debian/patches/regcomp_c.diff
glibc-package/branches/glibc-2.4/debian/patches/tst-setcontext_c.diff
Removed:
glibc-package/branches/glibc-2.4/debian/patches/sa_len-check.diff
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/patches/series
glibc-package/branches/glibc-2.4/debian/rules.d/build.mk
glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/amd64.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/hppa.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/kfreebsd-i386.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/sparc.mk
Log:
sync with trunk
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-03-05 02:06:47 UTC (rev 1267)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-03-06 20:55:01 UTC (rev 1268)
@@ -1,5 +1,20 @@
-glibc (2.3.6-3) UNRELEASED; urgency=low
+glibc (2.3.6-4) UNRELEASED; urgency=low
+ * Set configure_build to the same value as configure_host for sparc
+ optimized libraries (as on i386). This way they will be tested.
+ * If the CPU has biarch support, run tests for cross-compiled libraries.
+ * Remove ld.so from optimized libraries as it is not used.
+ * Add regcomp_c.diff (Call __libc_lock_init after init_dfa) from upstream
+ (Ulrich Drepper). This make possible to run the testsuite again on hppa.
+ * Enable the testsuite on hppa.
+ * Add tst-setcontext_c.diff (fix the arguments passed to setcontext during
+ test) from upstream.
+ * Create a link /usr/lib32 -> /emul/ia32-linux/usr/lib on amd64.
+
+ -- Aurelien Jarno <aurel32@debian.org> Thu, 2 Mar 2006 05:10:12 +0100
+
+glibc (2.3.6-3) unstable; urgency=low
+
[ Aurelien Jarno]
* Use a shell function instead of ifneq when testing a variable depending on
$(curpass), otherwise it is only evaluated at the first pass.
@@ -17,8 +32,6 @@
* Make libc6-i386-dev conflicts with all versions of ia32-libs-dev. As it
won't be built anymore on amd64, this will automatically remove it during
the upgrade.
- * Add sa_len-check.diff (fix sa_len check in getaddrinfo) from upstream.
- (Closes: #309774).
[ Clint Adams ]
* Get rid of -o as a binary operator to [ in tzconfig and postinst.
@@ -29,7 +42,7 @@
localedef from 2.3.6-2 and 2.3.6-3. (Closes: #352620)
* Updated Italian debconf translation, by Luca Monducci.
- -- Aurelien Jarno <aurel32@debian.org> Thu, 23 Feb 2006 21:46:25 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Wed, 1 Mar 2006 17:11:36 +0100
glibc (2.3.6-2) unstable; urgency=low
Copied: glibc-package/branches/glibc-2.4/debian/patches/regcomp_c.diff (from rev 1267, glibc-package/trunk/debian/patches/regcomp_c.diff)
Deleted: glibc-package/branches/glibc-2.4/debian/patches/sa_len-check.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/sa_len-check.diff 2006-03-05 02:06:47 UTC (rev 1267)
+++ glibc-package/branches/glibc-2.4/debian/patches/sa_len-check.diff 2006-03-06 20:55:01 UTC (rev 1268)
@@ -1,51 +0,0 @@
-2005-05-17 Neal H. Walfield <neal@gnu.org>
-
- [BZ #1350]
- * sysdeps/posix/getaddrinfo.c (gaih_local): Check [_HAVE_SA_LEN]
- instead of [SALEN].
- (gaih_inet): Likewise.
-2005-02-16 Roland McGrath <roland@redhat.com>
-
- * sysdeps/posix/getaddrinfo.c (gaih_inet): Fix type of ADDR local.
-
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/posix/getaddrinfo.c,v
-retrieving revision 1.85
-retrieving revision 1.85.2.1
-diff -u -r1.85 -r1.85.2.1
---- libc/sysdeps/posix/getaddrinfo.c 2004/11/22 18:41:37 1.85
-+++ libc/sysdeps/posix/getaddrinfo.c 2005/10/16 10:15:30 1.85.2.1
-@@ -196,10 +196,10 @@
- (*pai)->ai_addrlen = sizeof (struct sockaddr_un);
- (*pai)->ai_addr = (void *) (*pai) + sizeof (struct addrinfo);
-
--#if SALEN
-+#ifdef _HAVE_SA_LEN
- ((struct sockaddr_un *) (*pai)->ai_addr)->sun_len =
- sizeof (struct sockaddr_un);
--#endif /* SALEN */
-+#endif /* _HAVE_SA_LEN */
-
- ((struct sockaddr_un *)(*pai)->ai_addr)->sun_family = AF_LOCAL;
- memset(((struct sockaddr_un *)(*pai)->ai_addr)->sun_path, 0, UNIX_PATH_MAX);
-@@ -680,7 +680,7 @@
- h->h_length);
- else
- {
-- int32_t *addr = (uint32_t *) (*pat)->addr;
-+ uint32_t *addr = (uint32_t *) (*pat)->addr;
- addr[3] = *(uint32_t *) h->h_addr_list[i];
- addr[2] = htonl (0xffff);
- addr[1] = 0;
-@@ -1076,9 +1076,9 @@
- ai->ai_canonname = (char *) canon;
- canon = NULL;
-
--#if SALEN
-+#ifdef _HAVE_SA_LEN
- ai->ai_addr->sa_len = socklen;
--#endif /* SALEN */
-+#endif /* _HAVE_SA_LEN */
- ai->ai_addr->sa_family = family;
-
- if (family == AF_INET6)
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-03-05 02:06:47 UTC (rev 1267)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-03-06 20:55:01 UTC (rev 1268)
@@ -132,4 +132,5 @@
rtld.diff -p1
resource_h.diff -p1
hppa-inlining.diff -p1
-sa_len-check.diff -p1
+regcomp_c.diff -p1
+tst-setcontext_c.diff -p1
Copied: glibc-package/branches/glibc-2.4/debian/patches/tst-setcontext_c.diff (from rev 1267, glibc-package/trunk/debian/patches/tst-setcontext_c.diff)
Modified: glibc-package/branches/glibc-2.4/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/rules.d/build.mk 2006-03-05 02:06:47 UTC (rev 1267)
+++ glibc-package/branches/glibc-2.4/debian/rules.d/build.mk 2006-03-06 20:55:01 UTC (rev 1268)
@@ -80,7 +80,8 @@
$(stamp)check_%: $(stamp)build_%
if [ -n "$(findstring nocheck,$(DEB_BUILD_OPTIONS))" ]; then \
echo "DEB_BUILD_OPTIONS contains nocheck, skipping tests."; \
- elif [ $(call xx,configure_build) != $(call xx,configure_target) ]; then \
+ elif [ $(call xx,configure_build) != $(call xx,configure_target) ] && \
+ ! $(DEB_BUILDDIR)/libc.so >/dev/null 2>&1 ; then \
echo "Cross compiling, skipping tests."; \
elif ! $(call kernel_check,$(call xx,MIN_KERNEL_SUPPORTED)); then \
echo "Kernel too old, skipping tests."; \
@@ -105,6 +106,11 @@
(cd $(DEB_SRCDIR)/manual && texi2html -split_chapter libc.texinfo); \
fi
+ # Remove ld.so from optimized libraries
+ if [ $(curpass) != libc ] && [ $(call xx,configure_build) = $(call xx,configure_target) ]; then \
+ rm -f debian/tmp-$(curpass)/$(call xx,slibdir)/ld*.so* ; \
+ fi
+
# /usr/include/nptl and /usr/lib/nptl. It assumes tmp-libc is already installed.
if [ $(curpass) = nptl ]; then \
for file in `find debian/tmp-$(curpass)/usr/include -type f | sed 's/^debian\/tmp-nptl\///'`; do \
@@ -117,10 +123,14 @@
fi; \
done; \
install -d debian/tmp-libc/usr/lib/nptl; \
- for file in libc.a libc_nonshared.a libpthread.a libpthread_nonshared.a librt.a libc.so libpthread.so; do \
- install -m 644 debian/tmp-$(curpass)/usr/lib/nptl/$$file \
+ for file in libc.a libc_nonshared.a libpthread.a libpthread_nonshared.a librt.a ; do \
+ install -m 644 debian/tmp-$(curpass)/usr/lib/$$file \
debian/tmp-libc/usr/lib/nptl/$$file; \
done; \
+ for file in libc.so libpthread.so; do \
+ sed 's/\/usr\/lib\//\/usr\/lib\/nptl\//g' < debian/tmp-$(curpass)/usr/lib/$$file \
+ > debian/tmp-libc/usr/lib/nptl/$$file; \
+ done; \
ln -sf /lib/tls/librt.so.1 debian/tmp-libc/usr/lib/nptl/; \
fi
Modified: glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk 2006-03-05 02:06:47 UTC (rev 1267)
+++ glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk 2006-03-06 20:55:01 UTC (rev 1268)
@@ -225,6 +225,7 @@
sed -e "s#TMPDIR#debian/tmp-$$x#" -i $$z; \
sed -e "s#DEB_SRCDIR#$(DEB_SRCDIR)#" -i $$z; \
sed -e "s#SLIBDIR#$$slibdir#g" -i $$z; \
+ sed -e "s#LIBDIR#$$libdir#g" -i $$z; \
sed -e "s/^#.*//" -i $$z; \
done
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/amd64.mk 2006-03-05 02:06:47 UTC (rev 1267)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/amd64.mk 2006-03-06 20:55:01 UTC (rev 1268)
@@ -31,6 +31,7 @@
mkdir -p debian/libc6-dev-i386/usr/include
cp -af debian/tmp-i386/usr/include/i486-linux-gnu \
debian/libc6-dev-i386/usr/include
+ln -sf /emul/ia32-linux/usr/lib debian/libc6-dev-i386/usr/lib32
endef
define libc6-i386_extra_pkg_install
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/hppa.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/hppa.mk 2006-03-05 02:06:47 UTC (rev 1267)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/hppa.mk 2006-03-06 20:55:01 UTC (rev 1268)
@@ -9,7 +9,3 @@
ln -sf /usr/include debian/$(curpass)/usr/hppa64-linux-gnu/include
endef
-# some hppa linuxthreads tests: ex* do not work currently even if
-# TIMEOUTSCALE is set - SIGALRM from the program is just ignored.
-RUN_TESTSUITE = no
-
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk 2006-03-05 02:06:47 UTC (rev 1267)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk 2006-03-06 20:55:01 UTC (rev 1268)
@@ -15,6 +15,7 @@
i686_configure_target=i686-linux
i686_configure_build=i686-linux
i686_extra_cflags = -march=i686 -mtune=i686 -g1 -O3
+i686_rtlddir = /lib
i686_slibdir = /lib/tls/i686/cmov
i686_MIN_KERNEL_SUPPORTED = 2.6.0
i686_extra_config_options = $(extra_config_options) --disable-profile
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/kfreebsd-i386.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/kfreebsd-i386.mk 2006-03-05 02:06:47 UTC (rev 1267)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/kfreebsd-i386.mk 2006-03-06 20:55:01 UTC (rev 1268)
@@ -7,5 +7,6 @@
i686_configure_target=i686-kfreebsd
i686_configure_build=i686-kfreebsd
i686_extra_cflags = -march=i686 -mtune=i686 -g1 -O3
+i686_rtlddir = /lib
i686_slibdir = /lib/i686/cmov
i686_extra_config_options = $(extra_config_options) --disable-profile --disable-compatible-utmp
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk 2006-03-05 02:06:47 UTC (rev 1267)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk 2006-03-06 20:55:01 UTC (rev 1268)
@@ -36,8 +36,8 @@
nptl_add-ons = nptl $(add-ons)
nptl_extra_config_options = $(extra_config_options) --disable-profile
nptl_extra_cflags = -g1 -O3
+nptl_rtlddir = /lib
nptl_slibdir = /lib/tls
-nptl_libdir = /usr/lib/nptl
nptl_MIN_KERNEL_SUPPORTED = 2.6.0
KERNEL_HEADER_DIR = $(stamp)mkincludedir
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/sparc.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/sparc.mk 2006-03-05 02:06:47 UTC (rev 1267)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/sparc.mk 2006-03-06 20:55:01 UTC (rev 1268)
@@ -4,7 +4,7 @@
sparc64_MIN_KERNEL_SUPPORTED = 2.4.18
sparc64_configure_target=sparc64-linux
sparc64_CC = $(BUILD_CC) -m64
-sparc64_extra_cflags = -g2 -O3
+sparc64_extra_cflags = -g1 -O3
sparc64_extra_config_options = $(extra_config_options) --disable-profile --without-__thread --without-tls
sparc64_add-ons = linuxthreads $(add-ons)
libc6-sparc64_shlib_dep = libc6-sparc64 (>= $(shlib_dep_ver))
@@ -13,14 +13,18 @@
sparcv9_MIN_KERNEL_SUPPORTED = 2.4.18
sparcv9_configure_target=sparcv9-linux
-sparcv9_extra_cflags = -g2 -O3
+sparcv9_configure_build=sparcv9-linux
+sparcv9_extra_cflags = -g1 -O3
sparcv9_extra_config_options = $(extra_config_options) --disable-profile
sparcv9_add-ons = linuxthreads $(add-ons)
+sparcv9_rtlddir = /lib
sparcv9_slibdir = /lib/v9
sparcv9b_MIN_KERNEL_SUPPORTED = 2.4.18
sparcv9b_configure_target=sparcv9b-linux
-sparcv9b_extra_cflags = -g2 -O3
+sparcv9b_configure_build=sparcv9b-linux
+sparcv9b_extra_cflags = -g1 -O3
sparcv9b_extra_config_options = $(extra_config_options) --disable-profile
sparcv9b_add-ons = linuxthreads $(add-ons)
+sparcv9b_rtlddir = /lib
sparcv9b_slibdir = /lib/ultra3
Reply to: