r1366 - in glibc-package/trunk/debian: . sysdeps
Author: aurel32
Date: 2006-04-09 20:21:25 +0000 (Sun, 09 Apr 2006)
New Revision: 1366
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/sysdeps/i386.mk
Log:
Revert revision 1363, it fails to build
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-04-09 19:04:32 UTC (rev 1365)
+++ glibc-package/trunk/debian/changelog 2006-04-09 20:21:25 UTC (rev 1366)
@@ -21,7 +21,6 @@
* Add i386/local-i486_ldt_support.diff (add ldt support and thus TLS support
on i486 machines). Thanks to Petr Salinger for the hint. (Closes: #226716)
* Bump shlib to (>= 2.3.6-6) on i386.
- * Enable TLS for inside the glibc on i386.
* debian/debhelper.in/libc-alt.install: Add gconv-modules to the bi-arch
packages. (Closes: #361642)
Modified: glibc-package/trunk/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/i386.mk 2006-04-09 19:04:32 UTC (rev 1365)
+++ glibc-package/trunk/debian/sysdeps/i386.mk 2006-04-09 20:21:25 UTC (rev 1366)
@@ -3,6 +3,7 @@
# Starting with libc6 2.3.6-6 TLS support is enabled
libc6_shlib_dep = libc6 (>= 2.3.6-6)
+libc_extra_config_options = $(extra_config_options) --without-__thread
# NPTL requires at least i486 assembly. We don't need to take
# special measures for i386 systems, since Debian kernel images now
Reply to: