Commit 4524f965 authored by Aurelien Jarno's avatar Aurelien Jarno

Tagging 2.3.6-10


svn path=/glibc-package/tags/2.3.6-10/; revision=1506
parent b07ecc18
glibc (2.3.6-10) UNRELEASED; urgency=low
glibc (2.3.6-10) unstable; urgency=low
[ Aurelien Jarno ]
* debian/debhelper.in/libc.preinst: use the original path if readlink -f
* debian/debhelper.in/libc.preinst: use the original path if readlink -f
fails to canonicalize the path. (Closes: #368116)
* Add patches/arm/local-softfloat.diff (support for arm softfloat). (Closes:
* Add patches/arm/local-softfloat.diff (support for arm softfloat), and
enable on arm-softfloat only, as it breaks other architectures. (Closes:
#358772)
* debian/rules.d/control.mk: Add arm-softfloat to the architectures list.
-- Aurelien Jarno <aurel32@debian.org> Fri, 19 May 2006 05:49:18 +0000
* Do a separate pass for the udeb package, so that it could use different
build options.
* Set the minimum kernel to 2.6.1 for the udeb package, except for i386,
m68k, mips, mipsel, powerpc and s390.
* Enable the locales-all package. (Closes: #308020)
* debian/sysdeps/i386.mk: build the glibc with --without-__thread again on
i386 (Closes: #368022, #368326).
* debhelper.in/libc.preinst, debhelper.in/libc-otherbuild.postinst,
debhelper.in/libc.postinst, debhelper.in/libc-otherbuild.preinst: use
/bin/sh instead of /bin/bash. (Closes: #267594)
* patches/kfreebsd/local-sysdeps.diff: update to revision 1571 (from
glibc-bsd).
-- Aurelien Jarno <aurel32@debian.org> Sun, 21 May 2006 22:36:27 +0200
glibc (2.3.6-9) unstable; urgency=low
......
# FIXME: someday we may need to handle installing into non-lib.
debian/tmp-libc/lib/ld*.so* lib
debian/tmp-libc/lib/libm-*.so* lib
debian/tmp-libc/lib/libm.so* lib
debian/tmp-libc/lib/libdl*.so* lib
debian/tmp-libc/lib/libresolv*.so* lib
debian/tmp-libc/lib/libc-*.so* lib
debian/tmp-libc/lib/libc.so* lib
debian/tmp-libc/lib/libutil* lib
debian/tmp-libc/lib/libcrypt* lib
debian/tmp-udeb/lib/ld*.so* lib
debian/tmp-udeb/lib/libm-*.so* lib
debian/tmp-udeb/lib/libm.so* lib
debian/tmp-udeb/lib/libdl*.so* lib
debian/tmp-udeb/lib/libresolv*.so* lib
debian/tmp-udeb/lib/libc-*.so* lib
debian/tmp-udeb/lib/libc.so* lib
debian/tmp-udeb/lib/libutil* lib
debian/tmp-udeb/lib/libcrypt* lib
# FIXME: This should be with_threads arch's only.
debian/tmp-libc/lib/libpthread*.so* lib
debian/tmp-udeb/lib/libpthread*.so* lib
#!/bin/bash
#!/bin/sh
set -e
export LC_ALL=C
......
#!/bin/bash
#!/bin/sh
set -e
export LC_ALL=C
......
# FIXME: someday we may need to handle installing into non-lib.
debian/tmp-libc/lib/libnss_dns*.so* lib
debian/tmp-udeb/lib/libnss_dns*.so* lib
# FIXME: someday we may need to handle installing into non-lib.
debian/tmp-libc/lib/libnss_files*.so* lib
debian/tmp-udeb/lib/libnss_files*.so* lib
This diff is collapsed.
......@@ -57,7 +57,6 @@ arm/cvs-socket-weakalias.diff -p0
arm/local-dwarf2-buildfix.diff -p0
arm/local-ioperm.diff -p0
arm/local-no-hwcap.diff -p0
arm/local-softfloat.diff -p0
hppa/local-Rminkernel.diff -p0
hppa/submitted-drop-utimes.diff -p1
......
......@@ -86,7 +86,7 @@ ifdef SETNJOBS
endif
# Default setup
GLIBC_PASSES ?= libc
GLIBC_PASSES ?= libc udeb
prefix=/usr
bindir=$(prefix)/bin
......@@ -98,6 +98,10 @@ mandir=$(prefix)/share/man
sbindir=$(prefix)/sbin
libexecdir=$(prefix)/lib
udeb_add-ons = linuxthreads $(add-ons)
udeb_rtlddir = /lib
udeb_slibdir = /lib
BUILD_CC = gcc-4.0
RUN_TESTSUITE = yes
......@@ -131,8 +135,7 @@ endif
# Which build pass are we on?
curpass = $(filter-out %_,$(subst _,_ ,$@))
DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-prof $(libc)-pic
#DEB_ARCH_REGULAR_PACKAGES += locales-all
DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-prof $(libc)-pic locales-all
DEB_INDEP_REGULAR_PACKAGES = glibc-doc locales
DEB_UDEB_PACKAGES = $(libc)-udeb libnss-dns-udeb libnss-files-udeb
......
......@@ -110,14 +110,12 @@ $(stamp)install_%: $(stamp)check_%
if [ $(curpass) = libc ]; then \
$(MAKE) -f debian/generate-supported.mk IN=$(DEB_SRCDIR)/localedata/SUPPORTED \
OUT=debian/tmp-$(curpass)/usr/share/i18n/SUPPORTED; \
if false; then \
$(MAKE) -C $(DEB_BUILDDIR) -j $(NJOBS) \
objdir=$(DEB_BUILDDIR) install_root=$(CURDIR)/debian/tmp-$(curpass) \
localedata/install-locales; \
rm -rf $(CURDIR)/debian/locales-all/usr/lib; \
install -d $(CURDIR)/debian/locales-all/usr/lib; \
mv $(CURDIR)/debian/tmp-libc/usr/lib/locale $(CURDIR)/debian/locales-all/usr/lib/locales-all; \
fi; \
(cd $(DEB_SRCDIR)/manual && texi2html -split_chapter libc.texinfo); \
fi
......
......@@ -167,7 +167,7 @@ $(patsubst %,$(stamp)binaryinst_%,$(DEB_UDEB_PACKAGES)): $(stamp)debhelper
# say "include this in the main library" by setting a variable.
# But after 10 hours of staring at this thing, I can't figure it out.
OPT_PASSES = $(filter-out libc nptl,$(GLIBC_PASSES))
OPT_PASSES = $(filter-out libc nptl udeb,$(GLIBC_PASSES))
OPT_DIRS = $(foreach pass,$(OPT_PASSES),$($(pass)_slibdir) $($(pass)_libdir))
NPTL = $(filter nptl,$(GLIBC_PASSES))
......
......@@ -6,6 +6,10 @@ threads = no
libc = libc0.3
slibdir = /lib
# udeb Config
#udeb_extra_cflags = -Os
udeb_extra_config_options := $(extra_config_options) --without-tls libc_cv_z_relro=no
# Glibc should really do this for us.
define libc_extra_install
mkdir -p debian/tmp-$(curpass)/lib
......
GLIBC_PASSES += nptl i686 xen
DEB_ARCH_REGULAR_PACKAGES += libc6-i686 libc6-xen
udeb_MIN_KERNEL_SUPPORTED = 2.4.1
# 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
# emulate the missing instructions on the i386.
GLIBC_PASSES += nptl
nptl_configure_target=i486-linux
nptl_configure_build=i486-linux
nptl_extra_cflags = -march=i486 -mtune=i686 -g1 -O3
......@@ -14,6 +15,8 @@ nptl_extra_cflags = -march=i486 -mtune=i686 -g1 -O3
# We use -march=i686 and glibc's i686 routines use cmov, so require it.
# A Debian-local glibc patch adds cmov to the search path.
# The optimized libraries also use NPTL!
GLIBC_PASSES += i686
DEB_ARCH_REGULAR_PACKAGES += libc6-i686
i686_add-ons = nptl $(add-ons)
i686_configure_target=i686-linux
i686_extra_cflags = -march=i686 -mtune=i686 -g1 -O3
......@@ -24,6 +27,8 @@ i686_extra_config_options = $(extra_config_options) --disable-profile
# We use -mno-tls-direct-seg-refs to not wrap-around segments, as it
# greatly reduce the speed when running under the Xen hypervisor.
GLIBC_PASSES += xen
DEB_ARCH_REGULAR_PACKAGES += libc6-xen
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
......@@ -36,7 +41,6 @@ xen_extra_config_options = $(extra_config_options) --disable-profile
GLIBC_PASSES += amd64
DEB_ARCH_REGULAR_PACKAGES += libc6-amd64 libc6-dev-amd64
libc6-amd64_shlib_dep = libc6-amd64 (>= $(shlib_dep_ver))
amd64_configure_target = x86_64-linux
# __x86_64__ is defined here because Makeconfig uses -undef and the
# /usr/include/asm wrappers need that symbol.
......
......@@ -20,6 +20,10 @@ endif
# Minimum Kernel supported
with_headers = --with-headers=$(shell pwd)/debian/include --enable-kernel=$(call xx,MIN_KERNEL_SUPPORTED)
# udeb Config
#udeb_extra_cflags = -Os
udeb_MIN_KERNEL_SUPPORTED := 5.4.0
KERNEL_HEADER_DIR = $(stamp)mkincludedir
$(stamp)mkincludedir:
rm -rf debian/include
......
......@@ -19,6 +19,10 @@ endif
# Minimum Kernel supported
with_headers = --with-headers=$(shell pwd)/debian/include --enable-kernel=$(call xx,MIN_KERNEL_SUPPORTED)
# udeb Config
#udeb_extra_cflags = -Os
udeb_MIN_KERNEL_SUPPORTED = 2.6.1
# NPTL Config
nptl_add-ons = nptl $(add-ons)
nptl_extra_config_options = $(extra_config_options) --disable-profile
......
# m68k cannot be compiled with >= 2.4.xx
MIN_KERNEL_SUPPORTED := 2.2.0
udeb_MIN_KERNEL_SUPPORTED = 2.2.0
# work around to build on m68k, due to gcc-4.0 ICE. See #319312.
CC = gcc-3.4
BUILD_CC = gcc-3.4
......
udeb_MIN_KERNEL_SUPPORTED = 2.4.1
udeb_MIN_KERNEL_SUPPORTED = 2.4.1
GLIBC_PASSES += ppc64 nptl
DEB_ARCH_REGULAR_PACKAGES += libc6-ppc64 libc6-dev-ppc64
udeb_MIN_KERNEL_SUPPORTED = 2.4.1
ppc64_MIN_KERNEL_SUPPORTED = 2.6.0
ppc64_configure_target = powerpc64-linux
ppc64_CC = $(CC) -m64
......
GLIBC_PASSES += nptl s390x
DEB_ARCH_REGULAR_PACKAGES += libc6-s390x libc6-dev-s390x
s390x_MIN_KERNEL_SUPPORTED = 2.4.1
udeb_MIN_KERNEL_SUPPORTED = 2.4.1
s390x_configure_target = s390x-linux
s390x_CC = $(CC) -m64
s390x_add-ons = linuxthreads $(add-ons)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment