r1459 - in glibc-package/branches/glibc-2.4/debian: . debhelper.in local/manpages sysdeps
Author: schizo
Date: 2006-04-23 16:16:47 +0000 (Sun, 23 Apr 2006)
New Revision: 1459
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.postinst
glibc-package/branches/glibc-2.4/debian/local/manpages/Makefile
glibc-package/branches/glibc-2.4/debian/local/manpages/catchsegv.1
glibc-package/branches/glibc-2.4/debian/local/manpages/getconf.1
glibc-package/branches/glibc-2.4/debian/local/manpages/getent.1
glibc-package/branches/glibc-2.4/debian/local/manpages/sprof.1
glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk
Log:
[ Aurelien Jarno ]
* sysdeps/i386.mk: build glibc with --with-__thread on i386.
* debian/local/manpages: s/woody/etch/g. (Closes: #364198)
[ Denis Barbier ]
* locales.postinst: Do not abort if the current locale is not generated.
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-04-23 16:02:26 UTC (rev 1458)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-04-23 16:16:47 UTC (rev 1459)
@@ -42,6 +42,17 @@
-- Clint Adams <schizo@debian.org> Mon, 6 Mar 2006 16:49:38 -0500
+glibc (2.3.6-8) UNRELEASED; urgency=low
+
+ [ Aurelien Jarno ]
+ * sysdeps/i386.mk: build glibc with --with-__thread on i386.
+ * debian/local/manpages: s/woody/etch/g. (Closes: #364198)
+
+ [ Denis Barbier ]
+ * locales.postinst: Do not abort if the current locale is not generated.
+
+ -- Aurelien Jarno <aurel32@debian.org> Fri, 14 Apr 2006 20:28:41 +0200
+
glibc (2.3.6-7) unstable; urgency=medium
[ Aurelien Jarno ]
@@ -63,6 +74,8 @@
into libc-bin-dev. (Closes: #330735)
* Put each test log file in the corresponding package instead of putting all
of them in libc6.
+ * Remove sparc/local-sparc64-fixups.diff as /lib64 and /usr/lib64 are now a
+ default search path on 32/64-bit architectures.
* Switch minimum kernel to at least 2.4.0 on all arches but m68k, and change
kernelcheck.sh accordingly. Affected architectures:
- alpha: from 2.2.0 to 2.4.0
Modified: glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.postinst
===================================================================
--- glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.postinst 2006-04-23 16:02:26 UTC (rev 1458)
+++ glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.postinst 2006-04-23 16:16:47 UTC (rev 1459)
@@ -4,30 +4,6 @@
LG="/etc/locale.gen"
EE="/etc/default/locale"
-# Until locales 2.3.6-5, locale variables were stored into /etc/environment
-if [ "$1" = "configure" ] && [ -e "/etc/environment" ] && dpkg --compare-versions "$2" lt 2.3.6-5
-then
- OLDEE="/etc/environment"
- exist=1
- if [ ! -e "$EE" ]; then
- exist=
- found=
- echo "# File generated by update-locale" > $EE
- fi
- for i in LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION LC_ALL
- do
- if [ -z "$exist" ]; then
- if grep "^ *$i=" $OLDEE >> $EE; then
- found=1
- fi
- fi
- sed -i -e "s/^ *$i=/#&/" $OLDEE
- done
- if [ -z "$exist" ] && [ -z "$found" ]; then
- rm -f $EE
- fi
-fi
-
if [ "$1" = configure ]; then
. /usr/share/debconf/confmodule
@@ -89,7 +65,8 @@
# Set default LANG environment variable
if [ -e $EE ]; then
- /usr/sbin/update-locale --remove LANG
+ # Remove previous definitions
+ /usr/sbin/update-locale --no-checks LANG
fi
if [ -n "$SELECTED" ] && [ "$SELECTED" != "None" ]; then
/usr/sbin/update-locale "LANG=$SELECTED"
Modified: glibc-package/branches/glibc-2.4/debian/local/manpages/Makefile
===================================================================
--- glibc-package/branches/glibc-2.4/debian/local/manpages/Makefile 2006-04-23 16:02:26 UTC (rev 1458)
+++ glibc-package/branches/glibc-2.4/debian/local/manpages/Makefile 2006-04-23 16:16:47 UTC (rev 1459)
@@ -6,7 +6,7 @@
all: $(patsubst %.pod,%.1,$(wildcard *.pod)) $(SGML_MAN) po4a-man
%.1: %.pod
- pod2man --center="Debian GNU/Linux" --release="woody" $< > $@
+ pod2man --center="Debian GNU/Linux" --release="etch" $< > $@
locale-gen.8: locale-gen.8.sgml
docbook-to-man $< > $@
Modified: glibc-package/branches/glibc-2.4/debian/local/manpages/catchsegv.1
===================================================================
--- glibc-package/branches/glibc-2.4/debian/local/manpages/catchsegv.1 2006-04-23 16:02:26 UTC (rev 1458)
+++ glibc-package/branches/glibc-2.4/debian/local/manpages/catchsegv.1 2006-04-23 16:16:47 UTC (rev 1459)
@@ -96,7 +96,7 @@
.nr % 0
.rr F
.\}
-.TH CATCHSEGV 1 "woody" "7/Jan/2001" "Debian GNU/Linux"
+.TH CATCHSEGV 1 "etch" "7/Jan/2001" "Debian GNU/Linux"
.UC
.if n .hy 0
.if n .na
Modified: glibc-package/branches/glibc-2.4/debian/local/manpages/getconf.1
===================================================================
--- glibc-package/branches/glibc-2.4/debian/local/manpages/getconf.1 2006-04-23 16:02:26 UTC (rev 1458)
+++ glibc-package/branches/glibc-2.4/debian/local/manpages/getconf.1 2006-04-23 16:16:47 UTC (rev 1459)
@@ -96,7 +96,7 @@
.nr % 0
.rr F
.\}
-.TH GETCONF 1 "woody" "7/Jan/2001" "Debian GNU/Linux"
+.TH GETCONF 1 "etch" "7/Jan/2001" "Debian GNU/Linux"
.UC
.if n .hy 0
.if n .na
Modified: glibc-package/branches/glibc-2.4/debian/local/manpages/getent.1
===================================================================
--- glibc-package/branches/glibc-2.4/debian/local/manpages/getent.1 2006-04-23 16:02:26 UTC (rev 1458)
+++ glibc-package/branches/glibc-2.4/debian/local/manpages/getent.1 2006-04-23 16:16:47 UTC (rev 1459)
@@ -96,7 +96,7 @@
.nr % 0
.rr F
.\}
-.TH GETENT 1 "woody" "7/Jan/2001" "Debian GNU/Linux"
+.TH GETENT 1 "etch" "7/Jan/2001" "Debian GNU/Linux"
.UC
.if n .hy 0
.if n .na
Modified: glibc-package/branches/glibc-2.4/debian/local/manpages/sprof.1
===================================================================
--- glibc-package/branches/glibc-2.4/debian/local/manpages/sprof.1 2006-04-23 16:02:26 UTC (rev 1458)
+++ glibc-package/branches/glibc-2.4/debian/local/manpages/sprof.1 2006-04-23 16:16:47 UTC (rev 1459)
@@ -96,7 +96,7 @@
.nr % 0
.rr F
.\}
-.TH SPROF 1 "woody" "7/Jan/2001" "Debian GNU/Linux"
+.TH SPROF 1 "etch" "7/Jan/2001" "Debian GNU/Linux"
.UC
.if n .hy 0
.if n .na
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk 2006-04-23 16:02:26 UTC (rev 1458)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk 2006-04-23 16:16:47 UTC (rev 1459)
@@ -1,5 +1,5 @@
-GLIBC_PASSES += nptl i686
-DEB_ARCH_REGULAR_PACKAGES += libc6-i686
+GLIBC_PASSES += nptl i686 xen
+DEB_ARCH_REGULAR_PACKAGES += libc6-i686 libc6-xen
# NPTL requires at least i486 assembly. We don't need to take
# special measures for i386 systems, since Debian kernel images now
@@ -13,14 +13,21 @@
# The optimized libraries also use NPTL!
i686_add-ons = nptl $(add-ons)
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
-libc_extra_config_options = $(extra_config_options) --without-__thread
+# We use -mno-tls-direct-seg-refs to not wrap-around segments, as it
+# greatly reduce the speed when running under the Xen hypervisor.
+xen_add-ons = nptl $(add-ons)
+xen_configure_target=i686-linux
+xen_extra_cflags = -march=i686 -mtune=i686 -g1 -O3 -mno-tls-direct-seg-refs
+xen_rtlddir = /lib
+xen_slibdir = /lib/tls/i686/cmov
+xen_MIN_KERNEL_SUPPORTED = 2.6.0
+xen_extra_config_options = $(extra_config_options) --disable-profile
# build 64-bit (amd64) alternative library
GLIBC_PASSES += amd64
Reply to: