r2864 - in glibc-package/trunk/debian: . control.in sysdeps
Author: aurel32
Date: 2008-03-11 13:02:01 +0000 (Tue, 11 Mar 2008)
New Revision: 2864
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/main
glibc-package/trunk/debian/rules
glibc-package/trunk/debian/sysdeps/alpha.mk
glibc-package/trunk/debian/sysdeps/amd64.mk
glibc-package/trunk/debian/sysdeps/arm.mk
glibc-package/trunk/debian/sysdeps/armel.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-amd64.mk
glibc-package/trunk/debian/sysdeps/kfreebsd-i386.mk
glibc-package/trunk/debian/sysdeps/powerpc.mk
glibc-package/trunk/debian/sysdeps/ppc64.mk
glibc-package/trunk/debian/sysdeps/s390.mk
glibc-package/trunk/debian/sysdeps/sparc.mk
Log:
* control.in/main, sysdeps/*.mk, rules: build with gcc-4.3 by default,
except on alpha, arm, armel, hppa, s390 and hurd-i386.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2008-03-10 00:45:44 UTC (rev 2863)
+++ glibc-package/trunk/debian/changelog 2008-03-11 13:02:01 UTC (rev 2864)
@@ -1,7 +1,5 @@
glibc (2.7-10) unstable; urgency=low
- * control.in/main, sysdeps/ia64.mk, sysdeps/powerpc.mk, sysdeps/ppc64.mk:
- use gcc-4.3 on ia64, powerpc and ppc64.
* Update Chinese debconf translation, by LI Daobing.
* Update Dutch debconf translation, by Bart Cornelis. Closes: #468300.
* Update Polish debcon translation, by Emilian Nowak.
@@ -24,6 +22,8 @@
* patches/any/cvs-strtod.diff: new patch from CVS to fix strtod(). Closes:
#465769.
* Update Italian debconf translation, by Lica Monducci. Closes: #469985.
+ * control.in/main, sysdeps/*.mk, rules: build with gcc-4.3 by default,
+ except on alpha, arm, armel, hppa, s390 and hurd-i386.
[ Samuel Thibault ]
* patches/hurd-i386/cvs-blocked-exceptions.diff: new patch to dump
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2008-03-10 00:45:44 UTC (rev 2863)
+++ glibc-package/trunk/debian/control 2008-03-11 13:02:01 UTC (rev 2864)
@@ -7,8 +7,8 @@
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
binutils (>= 2.17cvs20070426-1),
- g++-4.2 (>= 4.2.1) [!amd64 !i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !powerpc64 !ppc64 !sparc], g++-4.2-multilib [s390],
- g++-4.3 [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 sparc], g++-4.3-multilib [amd64 i386 kfreebsd-amd64 powerpc ppc64 sparc]
+ g++-4.2 (>= 4.2.1) [alpha arm armel hppa s390 hurd-i386], g++-4.2-multilib [s390],
+ g++-4.3 [!alpha !arm !armel !hppa !s390 !hurd-i386], g++-4.3-multilib [amd64 i386 kfreebsd-amd64 powerpc ppc64 sparc]
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Uploaders: Ben Collins <bcollins@debian.org>, GOTO Masanori <gotom@debian.org>, Philip Blundell <pb@nexus.co.uk>, Jeff Bailey <jbailey@raspberryginger.com>, Daniel Jacobowitz <dan@debian.org>, Clint Adams <schizo@debian.org>, Aurelien Jarno <aurel32@debian.org>, Pierre Habouzit <madcoder@debian.org>
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2008-03-10 00:45:44 UTC (rev 2863)
+++ glibc-package/trunk/debian/control.in/main 2008-03-11 13:02:01 UTC (rev 2864)
@@ -7,8 +7,8 @@
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
binutils (>= 2.17cvs20070426-1),
- g++-4.2 (>= 4.2.1) [!amd64 !i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !powerpc64 !ppc64 !sparc], g++-4.2-multilib [s390],
- g++-4.3 [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 sparc], g++-4.3-multilib [amd64 i386 kfreebsd-amd64 powerpc ppc64 sparc]
+ g++-4.2 (>= 4.2.1) [alpha arm armel hppa s390 hurd-i386], g++-4.2-multilib [s390],
+ g++-4.3 [!alpha !arm !armel !hppa !s390 !hurd-i386], g++-4.3-multilib [amd64 i386 kfreebsd-amd64 powerpc ppc64 sparc]
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Uploaders: Ben Collins <bcollins@debian.org>, GOTO Masanori <gotom@debian.org>, Philip Blundell <pb@nexus.co.uk>, Jeff Bailey <jbailey@raspberryginger.com>, Daniel Jacobowitz <dan@debian.org>, Clint Adams <schizo@debian.org>, Aurelien Jarno <aurel32@debian.org>, Pierre Habouzit <madcoder@debian.org>
Modified: glibc-package/trunk/debian/rules
===================================================================
--- glibc-package/trunk/debian/rules 2008-03-10 00:45:44 UTC (rev 2863)
+++ glibc-package/trunk/debian/rules 2008-03-11 13:02:01 UTC (rev 2864)
@@ -90,8 +90,8 @@
mandir=$(prefix)/share/man
sbindir=$(prefix)/sbin
-BUILD_CC = gcc-4.2
-BUILD_CXX = g++-4.2
+BUILD_CC = gcc-4.3
+BUILD_CXX = g++-4.3
RUN_TESTSUITE = yes
Modified: glibc-package/trunk/debian/sysdeps/alpha.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/alpha.mk 2008-03-10 00:45:44 UTC (rev 2863)
+++ glibc-package/trunk/debian/sysdeps/alpha.mk 2008-03-11 13:02:01 UTC (rev 2864)
@@ -1,3 +1,8 @@
+ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
+CC = gcc-4.2
+CXX = g++-4.2
+endif
+
libc = libc6.1
# Requires Linux 2.6.9 for NPTL
Modified: glibc-package/trunk/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/amd64.mk 2008-03-10 00:45:44 UTC (rev 2863)
+++ glibc-package/trunk/debian/sysdeps/amd64.mk 2008-03-11 13:02:01 UTC (rev 2864)
@@ -1,8 +1,3 @@
-ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
-CC = gcc-4.3
-CXX = g++-4.3
-endif
-
libc_slibdir = /lib
libc_libdir = /usr/lib
libc_rtlddir = /lib64
Modified: glibc-package/trunk/debian/sysdeps/arm.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/arm.mk 2008-03-10 00:45:44 UTC (rev 2863)
+++ glibc-package/trunk/debian/sysdeps/arm.mk 2008-03-11 13:02:01 UTC (rev 2864)
@@ -1,3 +1,8 @@
+ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
+CC = gcc-4.2
+CXX = g++-4.2
+endif
+
libc_add-ons = ports nptl $(add-ons)
# We need __ARM_NR_set_tls syscall
Modified: glibc-package/trunk/debian/sysdeps/armel.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/armel.mk 2008-03-10 00:45:44 UTC (rev 2863)
+++ glibc-package/trunk/debian/sysdeps/armel.mk 2008-03-11 13:02:01 UTC (rev 2864)
@@ -1,3 +1,8 @@
+ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
+CC = gcc-4.2
+CXX = g++-4.2
+endif
+
libc_add-ons = ports nptl $(add-ons)
# First kernel version that supports EABI
Modified: glibc-package/trunk/debian/sysdeps/hppa.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/hppa.mk 2008-03-10 00:45:44 UTC (rev 2863)
+++ glibc-package/trunk/debian/sysdeps/hppa.mk 2008-03-11 13:02:01 UTC (rev 2864)
@@ -1,3 +1,8 @@
+ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
+CC = gcc-4.2
+CXX = g++-4.2
+endif
+
# To build the NPTL version of the glibc on hppa, uncomment the following line
# and comment the two next ones. Note that it is currently not binary
# compatible with the linuxthreads version.
Modified: glibc-package/trunk/debian/sysdeps/hurd.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/hurd.mk 2008-03-10 00:45:44 UTC (rev 2863)
+++ glibc-package/trunk/debian/sysdeps/hurd.mk 2008-03-11 13:02:01 UTC (rev 2864)
@@ -1,3 +1,8 @@
+ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
+CC = gcc-4.2
+CXX = g++-4.2
+endif
+
# This is for the GNU OS. Commonly known as the Hurd.
GLIBC_OVERLAYS ?= $(shell ls glibc-linuxthreads* glibc-ports* glibc-libidn*)
Modified: glibc-package/trunk/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/i386.mk 2008-03-10 00:45:44 UTC (rev 2863)
+++ glibc-package/trunk/debian/sysdeps/i386.mk 2008-03-11 13:02:01 UTC (rev 2864)
@@ -1,8 +1,3 @@
-ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
-CC = gcc-4.3
-CXX = g++-4.3
-endif
-
# 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!
Modified: glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk 2008-03-10 00:45:44 UTC (rev 2863)
+++ glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk 2008-03-11 13:02:01 UTC (rev 2864)
@@ -1,8 +1,3 @@
-ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
-CC = gcc-4.3
-CXX = g++-4.3
-endif
-
libc_slibdir = /lib
libc_libdir = /usr/lib
libc_rtlddir = /lib
Modified: glibc-package/trunk/debian/sysdeps/kfreebsd-i386.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/kfreebsd-i386.mk 2008-03-10 00:45:44 UTC (rev 2863)
+++ glibc-package/trunk/debian/sysdeps/kfreebsd-i386.mk 2008-03-11 13:02:01 UTC (rev 2864)
@@ -1,8 +1,3 @@
-ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
-CC = gcc-4.3
-CXX = g++-4.3
-endif
-
GLIBC_PASSES += i686
DEB_ARCH_REGULAR_PACKAGES += libc0.1-i686
Modified: glibc-package/trunk/debian/sysdeps/powerpc.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/powerpc.mk 2008-03-10 00:45:44 UTC (rev 2863)
+++ glibc-package/trunk/debian/sysdeps/powerpc.mk 2008-03-11 13:02:01 UTC (rev 2864)
@@ -1,8 +1,3 @@
-ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
-CC = gcc-4.3
-CXX = g++-4.3
-endif
-
# build 64-bit (ppc64) alternative library
GLIBC_PASSES += ppc64
DEB_ARCH_REGULAR_PACKAGES += libc6-ppc64 libc6-dev-ppc64
Modified: glibc-package/trunk/debian/sysdeps/ppc64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/ppc64.mk 2008-03-10 00:45:44 UTC (rev 2863)
+++ glibc-package/trunk/debian/sysdeps/ppc64.mk 2008-03-11 13:02:01 UTC (rev 2864)
@@ -1,8 +1,3 @@
-ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
-CC = gcc-4.3
-CXX = g++-4.3
-endif
-
libc_slibdir = /lib
libc_libdir = /usr/lib
libc_rtlddir = /lib64
Modified: glibc-package/trunk/debian/sysdeps/s390.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/s390.mk 2008-03-10 00:45:44 UTC (rev 2863)
+++ glibc-package/trunk/debian/sysdeps/s390.mk 2008-03-11 13:02:01 UTC (rev 2864)
@@ -1,3 +1,8 @@
+ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
+CC = gcc-4.2
+CXX = g++-4.2
+endif
+
# Some tests assume a fast machine
TIMEOUTFACTOR=2
Modified: glibc-package/trunk/debian/sysdeps/sparc.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/sparc.mk 2008-03-10 00:45:44 UTC (rev 2863)
+++ glibc-package/trunk/debian/sysdeps/sparc.mk 2008-03-11 13:02:01 UTC (rev 2864)
@@ -1,8 +1,3 @@
-ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
-CC = gcc-4.3
-CXX = g++-4.3
-endif
-
# build 64-bit (sparc64) alternative library
GLIBC_PASSES += sparc64
DEB_ARCH_REGULAR_PACKAGES += libc6-sparc64 libc6-dev-sparc64
Reply to: