r1567 - in glibc-package/trunk/debian: . control.in sysdeps
Author: aurel32
Date: 2006-05-28 21:34:49 +0000 (Sun, 28 May 2006)
New Revision: 1567
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/main
glibc-package/trunk/debian/sysdeps/alpha.mk
glibc-package/trunk/debian/sysdeps/amd64.mk
glibc-package/trunk/debian/sysdeps/hppa.mk
glibc-package/trunk/debian/sysdeps/i386.mk
glibc-package/trunk/debian/sysdeps/linux.mk
glibc-package/trunk/debian/sysdeps/m68k.mk
glibc-package/trunk/debian/sysdeps/mips.mk
glibc-package/trunk/debian/sysdeps/mipsel.mk
glibc-package/trunk/debian/sysdeps/powerpc.mk
glibc-package/trunk/debian/sysdeps/s390.mk
glibc-package/trunk/debian/sysdeps/sparc.mk
Log:
* debian/sysdeps/*.mk: build the udeb with -Os, except on alpha, m68k and
s390.
* debian/sysdeps/hppa.mk: build the udeb with gcc 4.1.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-05-28 21:33:38 UTC (rev 1566)
+++ glibc-package/trunk/debian/changelog 2006-05-28 21:34:49 UTC (rev 1567)
@@ -20,7 +20,9 @@
sarge into etch.
* debian/sysdeps/kfreebsd.mk: build the udeb package with -Os on
kfreebsd-i386 and kfreebsd-amd64.
- * debian/sysdeps/*.mk: build the udeb with -Os on amd64, i386, mips and
+ * debian/sysdeps/*.mk: build the udeb with -Os, except on alpha, m68k and
+ s390.
+ * debian/sysdeps/hppa.mk: build the udeb with gcc 4.1.
mipsel, powerpc and sparc.
* debian/sysdeps/arm.mk: set udeb_MIN_KERNEL_SUPPORTED to 2.4.1, as the
arm build daemons are still running a 2.4 kernel.
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2006-05-28 21:33:38 UTC (rev 1566)
+++ glibc-package/trunk/debian/control 2006-05-28 21:34:49 UTC (rev 1567)
@@ -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.0 [!m68k], gcc-3.4 [m68k], binutils (>= 2.16.1cvs20051109-1),
+ gcc-4.1 [hppa], 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-28 21:33:38 UTC (rev 1566)
+++ glibc-package/trunk/debian/control.in/main 2006-05-28 21:34:49 UTC (rev 1567)
@@ -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.0 [!m68k], gcc-3.4 [m68k], binutils (>= 2.16.1cvs20051109-1),
+ gcc-4.1 [hppa], 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/sysdeps/alpha.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/alpha.mk 2006-05-28 21:33:38 UTC (rev 1566)
+++ glibc-package/trunk/debian/sysdeps/alpha.mk 2006-05-28 21:34:49 UTC (rev 1567)
@@ -6,3 +6,6 @@
# disabled for static linked pthread programs.
libc_extra_config_options = $(extra_config_options) --without-__thread
+
+# udeb Config
+udeb_extra_cflags =
Modified: glibc-package/trunk/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/amd64.mk 2006-05-28 21:33:38 UTC (rev 1566)
+++ glibc-package/trunk/debian/sysdeps/amd64.mk 2006-05-28 21:34:49 UTC (rev 1567)
@@ -1,6 +1,3 @@
-# udeb Config
-udeb_extra_cflags = -Os
-
# build libc with nptl instead of linuxthreads
libc_MIN_KERNEL_SUPPORTED = 2.6.0
libc_add-ons = nptl $(add-ons)
Modified: glibc-package/trunk/debian/sysdeps/hppa.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/hppa.mk 2006-05-28 21:33:38 UTC (rev 1566)
+++ glibc-package/trunk/debian/sysdeps/hppa.mk 2006-05-28 21:34:49 UTC (rev 1567)
@@ -1,3 +1,6 @@
+# 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/i386.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/i386.mk 2006-05-28 21:33:38 UTC (rev 1566)
+++ glibc-package/trunk/debian/sysdeps/i386.mk 2006-05-28 21:34:49 UTC (rev 1567)
@@ -1,7 +1,3 @@
-# udeb Config
-udeb_MIN_KERNEL_SUPPORTED = 2.4.1
-udeb_extra_cflags = -Os
-
# 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
@@ -12,6 +8,9 @@
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/linux.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/linux.mk 2006-05-28 21:33:38 UTC (rev 1566)
+++ glibc-package/trunk/debian/sysdeps/linux.mk 2006-05-28 21:34:49 UTC (rev 1567)
@@ -20,9 +20,10 @@
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_cflags = -Os
+udeb_extra_config_options = $(extra_config_options) --without-tls
# NPTL Config
nptl_add-ons = nptl $(add-ons)
Modified: glibc-package/trunk/debian/sysdeps/m68k.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/m68k.mk 2006-05-28 21:33:38 UTC (rev 1566)
+++ glibc-package/trunk/debian/sysdeps/m68k.mk 2006-05-28 21:34:49 UTC (rev 1567)
@@ -1,9 +1,10 @@
# 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 Config
+udeb_extra_cflags =
+udeb_MIN_KERNEL_SUPPORTED = 2.2.0
Modified: glibc-package/trunk/debian/sysdeps/mips.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/mips.mk 2006-05-28 21:33:38 UTC (rev 1566)
+++ glibc-package/trunk/debian/sysdeps/mips.mk 2006-05-28 21:34:49 UTC (rev 1567)
@@ -1,3 +1,2 @@
# udeb Config
udeb_MIN_KERNEL_SUPPORTED = 2.4.1
-udeb_extra_cflags = -Os
Modified: glibc-package/trunk/debian/sysdeps/mipsel.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/mipsel.mk 2006-05-28 21:33:38 UTC (rev 1566)
+++ glibc-package/trunk/debian/sysdeps/mipsel.mk 2006-05-28 21:34:49 UTC (rev 1567)
@@ -1,3 +1,2 @@
# udeb Config
udeb_MIN_KERNEL_SUPPORTED = 2.4.1
-udeb_extra_cflags = -Os
Modified: glibc-package/trunk/debian/sysdeps/powerpc.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/powerpc.mk 2006-05-28 21:33:38 UTC (rev 1566)
+++ glibc-package/trunk/debian/sysdeps/powerpc.mk 2006-05-28 21:34:49 UTC (rev 1567)
@@ -1,6 +1,5 @@
# udeb Config
udeb_MIN_KERNEL_SUPPORTED = 2.4.1
-udeb_extra_cflags = -Os
# NPTL Config
GLIBC_PASSES += nptl
Modified: glibc-package/trunk/debian/sysdeps/s390.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/s390.mk 2006-05-28 21:33:38 UTC (rev 1566)
+++ glibc-package/trunk/debian/sysdeps/s390.mk 2006-05-28 21:34:49 UTC (rev 1567)
@@ -1,6 +1,8 @@
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
Modified: glibc-package/trunk/debian/sysdeps/sparc.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/sparc.mk 2006-05-28 21:33:38 UTC (rev 1566)
+++ glibc-package/trunk/debian/sysdeps/sparc.mk 2006-05-28 21:34:49 UTC (rev 1567)
@@ -1,6 +1,3 @@
-# udeb Config
-udeb_extra_cflags = -Os
-
# build 64-bit (sparc64) alternative library
GLIBC_PASSES += sparc64
DEB_ARCH_REGULAR_PACKAGES += libc6-sparc64 libc6-dev-sparc64
Reply to: