r5482 - in glibc-package/branches/eglibc-2.17/debian: . control.in sysdeps
Author: adconrad
Date: 2013-02-06 21:20:22 +0000 (Wed, 06 Feb 2013)
New Revision: 5482
Modified:
glibc-package/branches/eglibc-2.17/debian/changelog
glibc-package/branches/eglibc-2.17/debian/control
glibc-package/branches/eglibc-2.17/debian/control.in/main
glibc-package/branches/eglibc-2.17/debian/rules
glibc-package/branches/eglibc-2.17/debian/sysdeps/amd64.mk
glibc-package/branches/eglibc-2.17/debian/sysdeps/arm64.mk
glibc-package/branches/eglibc-2.17/debian/sysdeps/i386.mk
glibc-package/branches/eglibc-2.17/debian/sysdeps/x32.mk
Log:
Switch to gcc-4.7 across the board to tidy up some C99 conformance,
and force it to an experimental version at the request of Matthias.
Modified: glibc-package/branches/eglibc-2.17/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/changelog 2013-02-05 14:59:09 UTC (rev 5481)
+++ glibc-package/branches/eglibc-2.17/debian/changelog 2013-02-06 21:20:22 UTC (rev 5482)
@@ -1,5 +1,7 @@
eglibc (2.17-0experimental2) UNRELEASED; urgency=low
+ * Switch to gcc-4.7 across the board to tidy up some C99 conformance,
+ and force it to an experimental version at the request of Matthias.
* debian/testsuite-checking/expected-mips*: Allow tst-audit8 to fail.
-- Adam Conrad <adconrad@0c3.net> Sun, 03 Feb 2013 22:29:39 -0700
Modified: glibc-package/branches/eglibc-2.17/debian/control
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/control 2013-02-05 14:59:09 UTC (rev 5481)
+++ glibc-package/branches/eglibc-2.17/debian/control 2013-02-06 21:20:22 UTC (rev 5482)
@@ -8,8 +8,7 @@
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20120520-2~) [hurd-i386], gnumach-dev (>= 2:1.3.99.dfsg.git20120923~) [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-any],
binutils (>= 2.21),
- g++-4.6 [!arm64 !x32], g++-4.6-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc],
- g++-4.7 (>= 4.7.2-11) [amd64 arm64 i386 x32], g++-4.7-multilib (>= 4.7.2-11) [amd64 i386 x32]
+ g++-4.7 (>= 4.7.2-11), g++-4.7-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc x32]
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Build-Conflicts: binutils-gold
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Modified: glibc-package/branches/eglibc-2.17/debian/control.in/main
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/control.in/main 2013-02-05 14:59:09 UTC (rev 5481)
+++ glibc-package/branches/eglibc-2.17/debian/control.in/main 2013-02-06 21:20:22 UTC (rev 5482)
@@ -8,8 +8,7 @@
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20120520-2~) [hurd-i386], gnumach-dev (>= 2:1.3.99.dfsg.git20120923~) [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-any],
binutils (>= 2.21),
- g++-4.6 [!arm64 !x32], g++-4.6-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc],
- g++-4.7 (>= 4.7.2-11) [amd64 arm64 i386 x32], g++-4.7-multilib (>= 4.7.2-11) [amd64 i386 x32]
+ g++-4.7 (>= 4.7.2-11), g++-4.7-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc x32]
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Build-Conflicts: binutils-gold
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Modified: glibc-package/branches/eglibc-2.17/debian/rules
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/rules 2013-02-05 14:59:09 UTC (rev 5481)
+++ glibc-package/branches/eglibc-2.17/debian/rules 2013-02-06 21:20:22 UTC (rev 5482)
@@ -105,7 +105,7 @@
BASE_CC = gcc
BASE_CXX = g++
-DEB_GCC_VERSION ?= -4.6
+DEB_GCC_VERSION ?= -4.7
RUN_TESTSUITE = yes
Modified: glibc-package/branches/eglibc-2.17/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/sysdeps/amd64.mk 2013-02-05 14:59:09 UTC (rev 5481)
+++ glibc-package/branches/eglibc-2.17/debian/sysdeps/amd64.mk 2013-02-06 21:20:22 UTC (rev 5482)
@@ -43,8 +43,8 @@
libc6-x32_shlib_dep = libc6-x32 (>= $(shlib_dep_ver))
x32_add-ons = nptl $(add-ons)
x32_configure_target = x86_64-linux-gnux32
-x32_CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)-4.7 -mx32
-x32_CXX = $(DEB_HOST_GNU_TYPE)-$(BASE_CXX)-4.7 -mx32
+x32_CC = $(CC) -mx32
+x32_CXX = $(CXX) -mx32
x32_extra_config_options = $(extra_config_options) --disable-profile
x32_rtlddir = /libx32
x32_slibdir = /libx32
Modified: glibc-package/branches/eglibc-2.17/debian/sysdeps/arm64.mk
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/sysdeps/arm64.mk 2013-02-05 14:59:09 UTC (rev 5481)
+++ glibc-package/branches/eglibc-2.17/debian/sysdeps/arm64.mk 2013-02-06 21:20:22 UTC (rev 5482)
@@ -2,7 +2,3 @@
# Passing --disable-profile until arm64 has profiling support
extra_config_options = --enable-multi-arch --disable-profile
-
-# There is no gcc-4.6 for arm64, so use 4.7
-CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)-4.7
-CXX = $(DEB_HOST_GNU_TYPE)-$(BASE_CXX)-4.7
Modified: glibc-package/branches/eglibc-2.17/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/sysdeps/i386.mk 2013-02-05 14:59:09 UTC (rev 5481)
+++ glibc-package/branches/eglibc-2.17/debian/sysdeps/i386.mk 2013-02-06 21:20:22 UTC (rev 5482)
@@ -81,8 +81,8 @@
libc6-x32_shlib_dep = libc6-x32 (>= $(shlib_dep_ver))
x32_add-ons = nptl $(add-ons)
x32_configure_target = x86_64-linux-gnux32
-x32_CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)-4.7 -mx32
-x32_CXX = $(DEB_HOST_GNU_TYPE)-$(BASE_CXX)-4.7 -mx32
+x32_CC = $(CC) -mx32
+x32_CXX = $(CXX) -mx32
x32_extra_config_options = $(extra_config_options) --disable-profile
x32_rtlddir = /libx32
x32_slibdir = /libx32
Modified: glibc-package/branches/eglibc-2.17/debian/sysdeps/x32.mk
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/sysdeps/x32.mk 2013-02-05 14:59:09 UTC (rev 5481)
+++ glibc-package/branches/eglibc-2.17/debian/sysdeps/x32.mk 2013-02-06 21:20:22 UTC (rev 5482)
@@ -1,10 +1,6 @@
libc_rtlddir = /libx32
extra_config_options = --enable-multi-arch
-# There is no gcc-4.6 for x32, so use 4.7
-CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)-4.7
-CXX = $(DEB_HOST_GNU_TYPE)-$(BASE_CXX)-4.7
-
# build 64-bit (amd64) alternative library
EGLIBC_PASSES += amd64
DEB_ARCH_REGULAR_PACKAGES += libc6-amd64 libc6-dev-amd64
Reply to: