r845 - in glibc-package/trunk/debian: . control.in patches
Author: gotom
Date: 2004-12-23 08:32:50 -0700 (Thu, 23 Dec 2004)
New Revision: 845
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/main
glibc-package/trunk/debian/patches/glibc232-ia64-unwindinfo.dpatch
Log:
- Fix ia64 unwind FTBFS. Patched by Matthias Klose <doko@debian.org>:
- debian/patches/glibc232-ia64-unwindinfo.dpatch: Modify Makeconfig
which unconditionally set the libunwind macro to -lunwind, until the
it's safe again to regenerate the configure script, on advice of
Jeff Bailey. (Closes: #284563)
- debian/control.in/main: Tighten build dependency on ia64 to
gcc-3.3_3.3.5-4.
- debian/control: Likewise.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2004-12-16 09:32:14 UTC (rev 844)
+++ glibc-package/trunk/debian/changelog 2004-12-23 15:32:50 UTC (rev 845)
@@ -6,6 +6,15 @@
system call utimes() is not defined on hppa. Patched by Randolph Chung
<tausq@debian.org>. (Closes: #284449)
+ - Fix ia64 unwind FTBFS. Patched by Matthias Klose <doko@debian.org>:
+ - debian/patches/glibc232-ia64-unwindinfo.dpatch: Modify Makeconfig
+ which unconditionally set the libunwind macro to -lunwind, until the
+ it's safe again to regenerate the configure script, on advice of
+ Jeff Bailey. (Closes: #284563)
+ - debian/control.in/main: Tighten build dependency on ia64 to
+ gcc-3.3_3.3.5-4.
+ - debian/control: Likewise.
+
- debian/local/manpages/locale.1: Add the description about
/usr/share/i18n/SUPPORTED. Requested by Guillermo S. Romero
<gsromero@alumnos.euitt.upm.es>. (Closes: #284137)
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2004-12-16 09:32:14 UTC (rev 844)
+++ glibc-package/trunk/debian/control 2004-12-23 15:32:50 UTC (rev 845)
@@ -1,7 +1,7 @@
Source: glibc
Section: libs
Priority: required
-Build-Depends: gettext (>= 0.10.37-1), make (>= 3.80-1), dpkg-dev (>= 1.4.1.5), debianutils (>= 1.13.1), tar (>= 1.13.11), bzip2, texinfo (>= 4.0), linux-kernel-headers (>= 2.5.999-test7-bk-9) [!hurd-i386], mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386], texi2html, file, gcc-3.3 [!ia64] | gcc-3.4 [!ia64], gcc-3.3 (>= 1:3.3.5-3) [ia64] | gcc-3.4 (>= 3.4.3-2) [ia64], autoconf, binutils (>= 2.14.90.0.7-5), sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76)
+Build-Depends: gettext (>= 0.10.37-1), make (>= 3.80-1), dpkg-dev (>= 1.4.1.5), debianutils (>= 1.13.1), tar (>= 1.13.11), bzip2, texinfo (>= 4.0), linux-kernel-headers (>= 2.5.999-test7-bk-9) [!hurd-i386], mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386], texi2html, file, gcc-3.3 [!ia64] | gcc-3.4 [!ia64], gcc-3.3 (>= 1:3.3.5-4) [ia64] | gcc-3.4 (>= 3.4.3-2) [ia64], autoconf, binutils (>= 2.14.90.0.7-5), sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76)
Build-Depends-Indep: perl, po-debconf
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>
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2004-12-16 09:32:14 UTC (rev 844)
+++ glibc-package/trunk/debian/control.in/main 2004-12-23 15:32:50 UTC (rev 845)
@@ -1,7 +1,7 @@
Source: @glibc@
Section: libs
Priority: required
-Build-Depends: gettext (>= 0.10.37-1), make (>= 3.80-1), dpkg-dev (>= 1.4.1.5), debianutils (>= 1.13.1), tar (>= 1.13.11), bzip2, texinfo (>= 4.0), linux-kernel-headers (>= 2.5.999-test7-bk-9) [!hurd-i386], mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386], texi2html, file, gcc-3.3 [!ia64] | gcc-3.4 [!ia64], gcc-3.3 (>= 1:3.3.5-3) [ia64] | gcc-3.4 (>= 3.4.3-2) [ia64], autoconf, binutils (>= 2.14.90.0.7-5), sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76)
+Build-Depends: gettext (>= 0.10.37-1), make (>= 3.80-1), dpkg-dev (>= 1.4.1.5), debianutils (>= 1.13.1), tar (>= 1.13.11), bzip2, texinfo (>= 4.0), linux-kernel-headers (>= 2.5.999-test7-bk-9) [!hurd-i386], mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386], texi2html, file, gcc-3.3 [!ia64] | gcc-3.4 [!ia64], gcc-3.3 (>= 1:3.3.5-4) [ia64] | gcc-3.4 (>= 3.4.3-2) [ia64], autoconf, binutils (>= 2.14.90.0.7-5), sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76)
Build-Depends-Indep: perl, po-debconf
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>
Modified: glibc-package/trunk/debian/patches/glibc232-ia64-unwindinfo.dpatch
===================================================================
--- glibc-package/trunk/debian/patches/glibc232-ia64-unwindinfo.dpatch 2004-12-16 09:32:14 UTC (rev 844)
+++ glibc-package/trunk/debian/patches/glibc232-ia64-unwindinfo.dpatch 2004-12-23 15:32:50 UTC (rev 845)
@@ -10,7 +10,7 @@
# DP: Patch author: David Mosberger <davidm@napali.hpl.hp.com>
# DP: Upstream status: In CVS
# DP: Status Details:
-# DP: Date: 2004-11-26
+# DP: Date: 2004-11-26, update 2004-12-21.
PATCHLEVEL=3
@@ -57,6 +57,12 @@
(_init): Add unwind directives.
(_fini): Likewise.
+gotom: -20 adds another patch from doko:
+
+# * Makeconfig: Uconditionally set the libunwind macro to -lunwind,
+# until the it's safe again to regenerate the configure script, on
+# advice of Jeff Bailey. Closes: #284563.
+
diff -urN orig/glibc-2.3.2.ds1/build-tree/glibc-2.3.2/Makeconfig glibc-2.3.2.ds1/build-tree/glibc-2.3.2/Makeconfig
--- orig/glibc-2.3.2.ds1/build-tree/glibc-2.3.2/Makeconfig 2004-10-29 09:19:49.973173566 -0700
+++ glibc-2.3.2.ds1/build-tree/glibc-2.3.2/Makeconfig 2004-10-28 10:47:59.000000000 -0700
@@ -75,7 +81,7 @@
link-extra-libs-static = $(link-extra-libs)
endif
endif
-@@ -511,7 +511,19 @@
+@@ -511,7 +511,22 @@
link-extra-libs-bounded = $(foreach lib,$(LDLIBS-$(@F:%-bp=%)),$(common-objpfx)$(lib)_b.a)
ifndef gnulib
@@ -85,6 +91,9 @@
+else
+ libunwind = -lunwind
+endif
++ifeq ($(shell uname -m),ia64)
++ libunwind = -lunwind
++endif
+ifneq ($(have-as-needed),yes)
+ libgcc_eh := -lgcc_eh $(libunwind)
+else
Reply to: