r1588 - in glibc-package: branches/glibc-2.4/debian branches/glibc-2.4/debian/debhelper.in branches/glibc-2.4/debian/rules.d branches/glibc-2.4/debian/sysdeps trunk/debian trunk/debian/control.in trunk/debian/debhelper.in trunk/debian/rules.d trunk/debian/sysdeps
Author: aurel32
Date: 2006-05-30 18:04:58 +0000 (Tue, 30 May 2006)
New Revision: 1588
Removed:
glibc-package/trunk/debian/sysdeps/arm.mk
glibc-package/trunk/debian/sysdeps/mips.mk
glibc-package/trunk/debian/sysdeps/mipsel.mk
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/debhelper.in/libc-udeb.install
glibc-package/branches/glibc-2.4/debian/rules
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/arm.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/hurd.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/kfreebsd.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/m68k.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/mips.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/mipsel.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/powerpc.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/s390.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/sparc.mk
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/main
glibc-package/trunk/debian/debhelper.in/libc-udeb.install
glibc-package/trunk/debian/rules
glibc-package/trunk/debian/rules.d/build.mk
glibc-package/trunk/debian/rules.d/debhelper.mk
glibc-package/trunk/debian/sysdeps/hppa.mk
glibc-package/trunk/debian/sysdeps/hurd.mk
glibc-package/trunk/debian/sysdeps/i386.mk
glibc-package/trunk/debian/sysdeps/kfreebsd.mk
glibc-package/trunk/debian/sysdeps/linux.mk
glibc-package/trunk/debian/sysdeps/m68k.mk
glibc-package/trunk/debian/sysdeps/powerpc.mk
glibc-package/trunk/debian/sysdeps/s390.mk
glibc-package/trunk/debian/sysdeps/sparc.mk
Log:
* Don't do a udeb pass, it is still too buggy. (Closes: #369492)
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-05-30 18:04:58 UTC (rev 1588)
@@ -112,8 +112,14 @@
-- Aurelien Jarno <aurel32@debian.org> Sun, 28 May 2006 03:28:14 +0200
-glibc (2.3.6-11) UNRELEASED; urgency=low
+glibc (2.3.6-12) UNRELEASED; urgency=low
+ * Don't do a udeb pass, it is still too buggy. (Closes: #369492)
+
+ -- Aurelien Jarno <aurel32@debian.org> Tue, 30 May 2006 06:53:29 +0200
+
+glibc (2.3.6-11) unstable; urgency=low
+
[ Aurelien Jarno ]
* debian/rules/build.mk: don't remove ld.so from udeb packages.
* debian/rules: move udeb_add-ons to debian/sysdeps/{kfreebsd,linux}.mk.
@@ -126,7 +132,7 @@
for kernel-features.h) so that it could be used from other files.
- Add debian/patches/any/local-libgcc-static.diff (link with libgcc_s).
- Add debian/patches/m32r/local-ports-m32r.diff (m32r support).
- - Add debian/patches/m32r/cvs-elf-m32r_rel32.diff (Add R_M32R_REL32 to
+ - Add debian/patches/m32r/cvs-elf-m32r_rel32.diff (Add R_M32R_REL32 to
elf/elf.h).
* debian/local/manpages/localedef.1: fix a typo. (Closes: #310477)
* debian/local/manpages/iconv.1: fix the indentation (Closes: #316148)
@@ -163,7 +169,7 @@
* debian/debhelper.in/libc.preinst: use POSIX syntax for kill.
* debian/control.in/main: bump to Standards-Version 3.7.2.
- -- Denis Barbier <barbier@debian.org> Mon, 22 May 2006 23:14:52 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Tue, 30 May 2006 02:28:33 +0200
glibc (2.3.6-10) unstable; urgency=low
Modified: glibc-package/branches/glibc-2.4/debian/debhelper.in/libc-udeb.install
===================================================================
--- glibc-package/branches/glibc-2.4/debian/debhelper.in/libc-udeb.install 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/branches/glibc-2.4/debian/debhelper.in/libc-udeb.install 2006-05-30 18:04:58 UTC (rev 1588)
@@ -1,13 +1,13 @@
# FIXME: someday we may need to handle installing into non-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
+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
# FIXME: This should be with_threads arch's only.
-debian/tmp-udeb/lib/libpthread*.so* lib
+debian/tmp-libc/lib/libpthread*.so* lib
Modified: glibc-package/branches/glibc-2.4/debian/rules
===================================================================
--- glibc-package/branches/glibc-2.4/debian/rules 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/branches/glibc-2.4/debian/rules 2006-05-30 18:04:58 UTC (rev 1588)
@@ -86,7 +86,7 @@
endif
# Default setup
-GLIBC_PASSES ?= libc udeb
+GLIBC_PASSES ?= libc
prefix=/usr
bindir=$(prefix)/bin
@@ -98,9 +98,6 @@
sbindir=$(prefix)/sbin
libexecdir=$(prefix)/lib
-udeb_rtlddir = /lib
-udeb_slibdir = /lib
-
BUILD_CC = gcc-4.1
RUN_TESTSUITE = yes
Modified: glibc-package/branches/glibc-2.4/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/rules.d/build.mk 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/branches/glibc-2.4/debian/rules.d/build.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -120,7 +120,7 @@
fi
# Remove ld.so from optimized libraries
- if [ $(curpass) != libc ] && [ $(curpass) != udeb ] && [ $(call xx,configure_build) = $(call xx,configure_target) ]; then \
+ if [ $(curpass) != libc ] && [ $(call xx,configure_build) = $(call xx,configure_target) ]; then \
rm -f debian/tmp-$(curpass)/$(call xx,slibdir)/ld*.so* ; \
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-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -167,7 +167,7 @@
# 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 udeb,$(GLIBC_PASSES))
+OPT_PASSES = $(filter-out libc nptl, $(GLIBC_PASSES))
OPT_DIRS = $(foreach pass,$(OPT_PASSES),$($(pass)_slibdir) $($(pass)_libdir))
NPTL = $(filter nptl,$(GLIBC_PASSES))
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/amd64.mk 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/amd64.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -1,6 +1,3 @@
-# udeb Config
-udeb_add-ons = nptl $(add-ons)
-
# build libc with nptl instead of linuxthreads
libc_MIN_KERNEL_SUPPORTED = 2.6.0
libc_add-ons = nptl $(add-ons)
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/arm.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/arm.mk 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/arm.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -1,4 +1,2 @@
libc_add-ons = ports linuxthreads $(add-ons)
-# udeb Config
-udeb_MIN_KERNEL_SUPPORTED = 2.4.1
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/hurd.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/hurd.mk 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/hurd.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -6,10 +6,6 @@
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
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -6,9 +6,6 @@
ln -sf /usr/lib/i486-linux-gnu debian/$(curpass)/usr/lib/i386-linux-gnu
endef
-# udeb Config
-udeb_MIN_KERNEL_SUPPORTED = 2.4.1
-
# 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.
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/kfreebsd.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/kfreebsd.mk 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/kfreebsd.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -20,11 +20,6 @@
# 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
-udeb_add-ons = linuxthreads $(add-ons)
-
KERNEL_HEADER_DIR = $(stamp)mkincludedir
$(stamp)mkincludedir:
rm -rf debian/include
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -20,12 +20,6 @@
# 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
-udeb_add-ons = linuxthreads $(add-ons)
-udeb_extra_config_options = $(extra_config_options) --disable-sanity-checks
-
# NPTL Config
nptl_add-ons = nptl $(add-ons)
nptl_extra_config_options = $(extra_config_options) --disable-profile
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/m68k.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/m68k.mk 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/m68k.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -1,7 +1 @@
-MIN_KERNEL_SUPPORTED := 2.4.1
-
libc_add-ons = ports linuxthreads $(add-ons)
-
-# udeb Config
-udeb_extra_cflags =
-udeb_MIN_KERNEL_SUPPORTED = 2.2.0
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/mips.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/mips.mk 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/mips.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -1,4 +1,2 @@
libc_add-ons = ports linuxthreads $(add-ons)
-# udeb Config
-udeb_MIN_KERNEL_SUPPORTED = 2.4.1
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/mipsel.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/mipsel.mk 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/mipsel.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -1,4 +1,2 @@
libc_add-ons = ports linuxthreads $(add-ons)
-# udeb Config
-udeb_MIN_KERNEL_SUPPORTED = 2.4.1
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/powerpc.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/powerpc.mk 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/powerpc.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -1,6 +1,3 @@
-# udeb Config
-udeb_MIN_KERNEL_SUPPORTED = 2.4.1
-
# NPTL Config
GLIBC_PASSES += nptl
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/s390.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/s390.mk 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/s390.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -1,10 +1,6 @@
GLIBC_PASSES += nptl s390x
DEB_ARCH_REGULAR_PACKAGES += libc6-s390x libc6-dev-s390x
-# udeb Config
-udeb_extra_cflags =
-udeb_MIN_KERNEL_SUPPORTED = 2.4.1
-
s390x_configure_target = s390x-linux
s390x_CC = $(CC) -m64
s390x_add-ons = linuxthreads $(add-ons)
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/sparc.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/sparc.mk 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/sparc.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -1,6 +1,3 @@
-# udeb Config
-udeb_MIN_KERNEL_SUPPORTED = 2.4.1
-
# NPTL Config
GLIBC_PASSES += nptl
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/trunk/debian/changelog 2006-05-30 18:04:58 UTC (rev 1588)
@@ -1,6 +1,6 @@
glibc (2.3.6-12) UNRELEASED; urgency=low
- *
+ * Don't do a udeb pass, it is still too buggy. (Closes: #369492)
-- Aurelien Jarno <aurel32@debian.org> Tue, 30 May 2006 06:53:29 +0200
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/trunk/debian/control 2006-05-30 18:04:58 UTC (rev 1588)
@@ -6,7 +6,7 @@
linux-kernel-headers (>= 2.6.13+0rc3-2) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
- gcc-4.1 [hppa], gcc-4.0 [!m68k], gcc-3.4 [m68k], binutils (>= 2.16.1cvs20051109-1),
+ gcc-4.0 [!m68k], gcc-3.4 [m68k], binutils (>= 2.16.1cvs20051109-1),
autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76),
libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64],
quilt
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/trunk/debian/control.in/main 2006-05-30 18:04:58 UTC (rev 1588)
@@ -6,7 +6,7 @@
linux-kernel-headers (>= 2.6.13+0rc3-2) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
- gcc-4.1 [hppa], gcc-4.0 [!m68k], gcc-3.4 [m68k], binutils (>= 2.16.1cvs20051109-1),
+ gcc-4.0 [!m68k], gcc-3.4 [m68k], binutils (>= 2.16.1cvs20051109-1),
autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76),
libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64],
quilt
Modified: glibc-package/trunk/debian/debhelper.in/libc-udeb.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-udeb.install 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/trunk/debian/debhelper.in/libc-udeb.install 2006-05-30 18:04:58 UTC (rev 1588)
@@ -1,13 +1,13 @@
# FIXME: someday we may need to handle installing into non-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
+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
# FIXME: This should be with_threads arch's only.
-debian/tmp-udeb/lib/libpthread*.so* lib
+debian/tmp-libc/lib/libpthread*.so* lib
Modified: glibc-package/trunk/debian/rules
===================================================================
--- glibc-package/trunk/debian/rules 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/trunk/debian/rules 2006-05-30 18:04:58 UTC (rev 1588)
@@ -86,7 +86,7 @@
endif
# Default setup
-GLIBC_PASSES ?= libc udeb
+GLIBC_PASSES ?= libc
prefix=/usr
bindir=$(prefix)/bin
@@ -98,9 +98,6 @@
sbindir=$(prefix)/sbin
libexecdir=$(prefix)/lib
-udeb_rtlddir = /lib
-udeb_slibdir = /lib
-
BUILD_CC = gcc-4.0
RUN_TESTSUITE = yes
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/trunk/debian/rules.d/build.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -120,7 +120,7 @@
fi
# Remove ld.so from optimized libraries
- if [ $(curpass) != libc ] && [ $(curpass) != udeb ] && [ $(call xx,configure_build) = $(call xx,configure_target) ]; then \
+ if [ $(curpass) != libc ] && [ $(call xx,configure_build) = $(call xx,configure_target) ]; then \
rm -f debian/tmp-$(curpass)/$(call xx,slibdir)/ld*.so* ; \
fi
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -167,7 +167,7 @@
# 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 udeb,$(GLIBC_PASSES))
+OPT_PASSES = $(filter-out libc nptl, $(GLIBC_PASSES))
OPT_DIRS = $(foreach pass,$(OPT_PASSES),$($(pass)_slibdir) $($(pass)_libdir))
NPTL = $(filter nptl,$(GLIBC_PASSES))
Deleted: glibc-package/trunk/debian/sysdeps/arm.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/arm.mk 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/trunk/debian/sysdeps/arm.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -1,2 +0,0 @@
-# udeb Config
-udeb_MIN_KERNEL_SUPPORTED = 2.4.1
Modified: glibc-package/trunk/debian/sysdeps/hppa.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/hppa.mk 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/trunk/debian/sysdeps/hppa.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -1,6 +1,3 @@
-# udeb Config
-udeb_CC = gcc-4.1
-
# hppa64 needs symlink /usr/hppa64-linux/include to /usr/include
# (See: Bug#239020) In future we may drop this file with supporting hppa64.
Modified: glibc-package/trunk/debian/sysdeps/hurd.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/hurd.mk 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/trunk/debian/sysdeps/hurd.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -6,10 +6,6 @@
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
Modified: glibc-package/trunk/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/i386.mk 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/trunk/debian/sysdeps/i386.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -8,9 +8,6 @@
ln -sf /usr/lib/i486-linux-gnu debian/$(curpass)/usr/lib/i386-linux-gnu
endef
-# udeb Config
-udeb_MIN_KERNEL_SUPPORTED = 2.4.1
-
# 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.
Modified: glibc-package/trunk/debian/sysdeps/kfreebsd.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/kfreebsd.mk 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/trunk/debian/sysdeps/kfreebsd.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -20,11 +20,6 @@
# 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
-udeb_add-ons = linuxthreads $(add-ons)
-
KERNEL_HEADER_DIR = $(stamp)mkincludedir
$(stamp)mkincludedir:
rm -rf debian/include
Modified: glibc-package/trunk/debian/sysdeps/linux.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/linux.mk 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/trunk/debian/sysdeps/linux.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -19,12 +19,6 @@
# Minimum Kernel supported
with_headers = --with-headers=$(shell pwd)/debian/include --enable-kernel=$(call xx,MIN_KERNEL_SUPPORTED)
-# udeb Config
-udeb_MIN_KERNEL_SUPPORTED = 2.6.1
-udeb_add-ons = linuxthreads $(add-ons)
-udeb_extra_cflags = -Os
-udeb_extra_config_options = $(extra_config_options) --without-tls
-
# NPTL Config
nptl_add-ons = nptl $(add-ons)
nptl_extra_config_options = $(extra_config_options) --disable-profile
Modified: glibc-package/trunk/debian/sysdeps/m68k.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/m68k.mk 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/trunk/debian/sysdeps/m68k.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -5,6 +5,3 @@
CC = gcc-3.4
BUILD_CC = gcc-3.4
-# udeb Config
-udeb_extra_cflags =
-udeb_MIN_KERNEL_SUPPORTED = 2.2.0
Deleted: glibc-package/trunk/debian/sysdeps/mips.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/mips.mk 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/trunk/debian/sysdeps/mips.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -1,2 +0,0 @@
-# udeb Config
-udeb_MIN_KERNEL_SUPPORTED = 2.4.1
Deleted: glibc-package/trunk/debian/sysdeps/mipsel.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/mipsel.mk 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/trunk/debian/sysdeps/mipsel.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -1,2 +0,0 @@
-# udeb Config
-udeb_MIN_KERNEL_SUPPORTED = 2.4.1
Modified: glibc-package/trunk/debian/sysdeps/powerpc.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/powerpc.mk 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/trunk/debian/sysdeps/powerpc.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -1,6 +1,3 @@
-# udeb Config
-udeb_MIN_KERNEL_SUPPORTED = 2.4.1
-
# NPTL Config
GLIBC_PASSES += nptl
Modified: glibc-package/trunk/debian/sysdeps/s390.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/s390.mk 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/trunk/debian/sysdeps/s390.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -1,10 +1,9 @@
-GLIBC_PASSES += nptl s390x
-DEB_ARCH_REGULAR_PACKAGES += libc6-s390x libc6-dev-s390x
+# NPTL Config
+GLIBC_PASSES += nptl
-# udeb Config
-udeb_extra_cflags =
-udeb_MIN_KERNEL_SUPPORTED = 2.4.1
-
+# build 64-bit (s390x) alternative library
+GLIBC_PASSES += s390x
+DEB_ARCH_REGULAR_PACKAGES += libc6-s390x libc6-dev-s390x
s390x_configure_target = s390x-linux
s390x_CC = $(CC) -m64
s390x_add-ons = linuxthreads $(add-ons)
Modified: glibc-package/trunk/debian/sysdeps/sparc.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/sparc.mk 2006-05-30 16:31:53 UTC (rev 1587)
+++ glibc-package/trunk/debian/sysdeps/sparc.mk 2006-05-30 18:04:58 UTC (rev 1588)
@@ -1,6 +1,3 @@
-# udeb Config
-udeb_MIN_KERNEL_SUPPORTED = 2.4.1
-
# build 64-bit (sparc64) alternative library
GLIBC_PASSES += sparc64
DEB_ARCH_REGULAR_PACKAGES += libc6-sparc64 libc6-dev-sparc64
Reply to: