r1960 - in glibc-package/branches/glibc-2.5/debian: . control.in sysdeps
Author: aurel32
Date: 2007-02-08 21:01:04 +0100 (Thu, 08 Feb 2007)
New Revision: 1960
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/control
glibc-package/branches/glibc-2.5/debian/control.in/main
glibc-package/branches/glibc-2.5/debian/sysdeps/hurd.mk
Log:
Switch back hurd-i386 to gcc-4.0
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2007-02-08 19:39:45 UTC (rev 1959)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2007-02-08 20:01:04 UTC (rev 1960)
@@ -179,7 +179,7 @@
* debian/sysdeps/mips.mk: use ports add-on
* debian/sysdeps/mipsel.mk: use ports add-on
* debian/sysdeps/arm.mk: use ports add-on
- * Build with gcc 4.1 on all architectures.
+ * Build with gcc 4.1 on all architectures but hurd-i386.
* debian/debhelper.in/nscd.init: partially sync nscd initscript
with upstream.
* Remove mips/local-librt.diff.
Modified: glibc-package/branches/glibc-2.5/debian/control
===================================================================
--- glibc-package/branches/glibc-2.5/debian/control 2007-02-08 19:39:45 UTC (rev 1959)
+++ glibc-package/branches/glibc-2.5/debian/control 2007-02-08 20:01:04 UTC (rev 1960)
@@ -5,7 +5,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.2 [hppa], binutils (>= 2.17.50),
+ gcc-4.0 [hurd-i386], gcc-4.1 [!hppa !hurd-i386], gcc-4.2 [hppa], binutils (>= 2.17.50),
autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 5.0),
libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390], libc0.1-dev-i386 [kfreebsd-amd64],
lib32ssp0 [amd64 kfreebsd-amd64 ppc64], lib64ssp0 [i386 powerpc sparc s390],
Modified: glibc-package/branches/glibc-2.5/debian/control.in/main
===================================================================
--- glibc-package/branches/glibc-2.5/debian/control.in/main 2007-02-08 19:39:45 UTC (rev 1959)
+++ glibc-package/branches/glibc-2.5/debian/control.in/main 2007-02-08 20:01:04 UTC (rev 1960)
@@ -5,7 +5,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.2 [hppa], binutils (>= 2.17.50),
+ gcc-4.0 [hurd-i386], gcc-4.1 [!hppa !hurd-i386], gcc-4.2 [hppa], binutils (>= 2.17.50),
autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 5.0),
libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390], libc0.1-dev-i386 [kfreebsd-amd64],
lib32ssp0 [amd64 kfreebsd-amd64 ppc64], lib64ssp0 [i386 powerpc sparc s390],
Modified: glibc-package/branches/glibc-2.5/debian/sysdeps/hurd.mk
===================================================================
--- glibc-package/branches/glibc-2.5/debian/sysdeps/hurd.mk 2007-02-08 19:39:45 UTC (rev 1959)
+++ glibc-package/branches/glibc-2.5/debian/sysdeps/hurd.mk 2007-02-08 20:01:04 UTC (rev 1960)
@@ -21,5 +21,9 @@
# ld.so is broken currently if z_relro is used.
libc_extra_config_options := $(extra_config_options) --without-__thread --without-tls libc_cv_z_relro=no
+# Build with gcc-4.1 is not yet supported.
+CC = gcc-4.0
+BUILD_CC = gcc-4.0
+
# Only use libidn as add-on.
standard-add-ons = libidn
Reply to: