r5569 - in glibc-package/trunk/debian: . control.in sysdeps
Author: adconrad
Date: 2013-05-09 09:59:50 +0000 (Thu, 09 May 2013)
New Revision: 5569
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/main
glibc-package/trunk/debian/sysdeps/ia64.mk
Log:
debian/sysdeps/ia64.mk, debian/control: Switch ia64 back to gcc-4.6,
as our world explodes when compiled with gcc-4.7 on ia64 right now.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2013-05-09 09:46:08 UTC (rev 5568)
+++ glibc-package/trunk/debian/changelog 2013-05-09 09:59:50 UTC (rev 5569)
@@ -7,6 +7,8 @@
this is no longer needed by the updated glibc-bsd sysdeps upstream.
* debian/patches/any/cvs-regexp-overrun.diff: Backport patch from git
to resolve regex matcher overrun, CVE-2013-0242 (Closes: #699399)
+ * debian/sysdeps/ia64.mk, debian/control: Switch ia64 back to gcc-4.6,
+ as our world explodes when compiled with gcc-4.7 on ia64 right now.
[ Aurelien Jarno ]
* patches/any/cvs-sys-param-h-DEV_BSIZE.diff: New patch to fix
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2013-05-09 09:46:08 UTC (rev 5568)
+++ glibc-package/trunk/debian/control 2013-05-09 09:59:50 UTC (rev 5569)
@@ -8,6 +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 [ia64],
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
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2013-05-09 09:46:08 UTC (rev 5568)
+++ glibc-package/trunk/debian/control.in/main 2013-05-09 09:59:50 UTC (rev 5569)
@@ -8,6 +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 [ia64],
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
Modified: glibc-package/trunk/debian/sysdeps/ia64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/ia64.mk 2013-05-09 09:46:08 UTC (rev 5568)
+++ glibc-package/trunk/debian/sysdeps/ia64.mk 2013-05-09 09:59:50 UTC (rev 5569)
@@ -1,3 +1,7 @@
libc_add-ons = ports nptl $(add-ons)
+# gcc-4.7 explodes on ia64, so use gcc-4.6 for now
+CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)-4.6
+CXX = $(DEB_HOST_GNU_TYPE)-$(BASE_CXX)-4.6
+
libc = libc6.1
Reply to: