Chris Lamb wrote:
> insight FTBFS in testing:
>
> http://buildd.debian.org/pkg.cgi?pkg=insight;dist=testing
Synopsis: t-p-u upload to fix #494339 FTBFS on hppa and alpha
for reasons that appeared unrelated to the original patch.
I didn't hear anything back from the porters so I looked closer. I have come
up with a new package - permission to upload? The associated changelog entry
is:
insight (6.6-1lenny3) testing-proposed-updates; urgency=low
* Non-maintainer upload.
* Fix FTBFS in lenny on hppa:
- Don't use <asm/offsets.h> to find PT_* register offsets as this header
is no longer part of Linux public interface; use <asm/ptrace.h> and
offsetof to define these macros. Patch cherry-picked from GDB upstram,
originally by Daniel Jacobowitz <drow@false.org> and Kyle McMartin.
- Add Build-Depends on linux-libc-dev on hppa for <asm/ptrace.h> header.
* Fix FTBFS in lenny on alpha:
- Build-Depend on libc6.1-dev (>= 2.7-11) on this arch to ensure a
version of <sys/user.h> which does not #include <asm/page.h>, which is
required since Linux 2.6.25.
-- Chris Lamb <lamby@debian.org> Wed, 15 Oct 2008 23:28:41 +0100
Debdiff attached.
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` lamby@debian.org
`-
diff -u insight-6.6/debian/control insight-6.6/debian/control --- insight-6.6/debian/control +++ insight-6.6/debian/control @@ -2,7 +2,7 @@ Section: devel Priority: optional Maintainer: Masayuki Hatta (mhatta) <mhatta@debian.org> -Build-Depends: autotools-dev, binutils-dev, bison, debhelper (>> 4.0.0), dpatch, flex, itcl3-dev, itk3-dev, iwidgets4, libncurses-dev, texinfo, tcl8.4-dev, tk8.4-dev +Build-Depends: autotools-dev, binutils-dev, bison, debhelper (>> 4.0.0), dpatch, flex, itcl3-dev, itk3-dev, iwidgets4, libncurses-dev, texinfo, tcl8.4-dev, tk8.4-dev, linux-libc-dev [hppa], libc6.1-dev (>= 2.7-11) [alpha] Standards-Version: 3.7.2 Package: insight diff -u insight-6.6/debian/changelog insight-6.6/debian/changelog --- insight-6.6/debian/changelog +++ insight-6.6/debian/changelog @@ -1,3 +1,19 @@ +insight (6.6-1lenny3) testing-proposed-updates; urgency=low + + * Non-maintainer upload. + * Fix FTBFS in lenny on hppa: + - Don't use <asm/offsets.h> to find PT_* register offsets as this header + is no longer part of Linux public interface; use <asm/ptrace.h> and + offsetof to define these macros. Patch cherry-picked from GDB upstream, + originally by Daniel Jacobowitz <drow@false.org> and Kyle McMartin. + - Add Build-Depends on linux-libc-dev on hppa for <asm/ptrace.h> header. + * Fix FTBFS in lenny on alpha: + - Build-Depend on libc6.1-dev (>= 2.7-11) on this arch to ensure a version + of <sys/user.h> which does not #include <asm/page.h>, which is required + since Linux 2.6.25. + + -- Chris Lamb <lamby@debian.org> Wed, 15 Oct 2008 23:28:41 +0100 + insight (6.6-1lenny2) testing-proposed-updates; urgency=low * Non-maintainer upload. --- insight-6.6.orig/gdb/hppa-linux-offsets.h +++ insight-6.6/gdb/hppa-linux-offsets.h @@ -0,0 +1,103 @@ +/* Register offsets for HPPA running GNU/Linux. + + Copyright (C) 2007 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#define PT_PSW offsetof(struct pt_regs, gr[ 0]) +#define PT_GR1 offsetof(struct pt_regs, gr[ 1]) +#define PT_GR2 offsetof(struct pt_regs, gr[ 2]) +#define PT_GR3 offsetof(struct pt_regs, gr[ 3]) +#define PT_GR4 offsetof(struct pt_regs, gr[ 4]) +#define PT_GR5 offsetof(struct pt_regs, gr[ 5]) +#define PT_GR6 offsetof(struct pt_regs, gr[ 6]) +#define PT_GR7 offsetof(struct pt_regs, gr[ 7]) +#define PT_GR8 offsetof(struct pt_regs, gr[ 8]) +#define PT_GR9 offsetof(struct pt_regs, gr[ 9]) +#define PT_GR10 offsetof(struct pt_regs, gr[10]) +#define PT_GR11 offsetof(struct pt_regs, gr[11]) +#define PT_GR12 offsetof(struct pt_regs, gr[12]) +#define PT_GR13 offsetof(struct pt_regs, gr[13]) +#define PT_GR14 offsetof(struct pt_regs, gr[14]) +#define PT_GR15 offsetof(struct pt_regs, gr[15]) +#define PT_GR16 offsetof(struct pt_regs, gr[16]) +#define PT_GR17 offsetof(struct pt_regs, gr[17]) +#define PT_GR18 offsetof(struct pt_regs, gr[18]) +#define PT_GR19 offsetof(struct pt_regs, gr[19]) +#define PT_GR20 offsetof(struct pt_regs, gr[20]) +#define PT_GR21 offsetof(struct pt_regs, gr[21]) +#define PT_GR22 offsetof(struct pt_regs, gr[22]) +#define PT_GR23 offsetof(struct pt_regs, gr[23]) +#define PT_GR24 offsetof(struct pt_regs, gr[24]) +#define PT_GR25 offsetof(struct pt_regs, gr[25]) +#define PT_GR26 offsetof(struct pt_regs, gr[26]) +#define PT_GR27 offsetof(struct pt_regs, gr[27]) +#define PT_GR28 offsetof(struct pt_regs, gr[28]) +#define PT_GR29 offsetof(struct pt_regs, gr[29]) +#define PT_GR30 offsetof(struct pt_regs, gr[30]) +#define PT_GR31 offsetof(struct pt_regs, gr[31]) +#define PT_FR0 offsetof(struct pt_regs, fr[ 0]) +#define PT_FR1 offsetof(struct pt_regs, fr[ 1]) +#define PT_FR2 offsetof(struct pt_regs, fr[ 2]) +#define PT_FR3 offsetof(struct pt_regs, fr[ 3]) +#define PT_FR4 offsetof(struct pt_regs, fr[ 4]) +#define PT_FR5 offsetof(struct pt_regs, fr[ 5]) +#define PT_FR6 offsetof(struct pt_regs, fr[ 6]) +#define PT_FR7 offsetof(struct pt_regs, fr[ 7]) +#define PT_FR8 offsetof(struct pt_regs, fr[ 8]) +#define PT_FR9 offsetof(struct pt_regs, fr[ 9]) +#define PT_FR10 offsetof(struct pt_regs, fr[10]) +#define PT_FR11 offsetof(struct pt_regs, fr[11]) +#define PT_FR12 offsetof(struct pt_regs, fr[12]) +#define PT_FR13 offsetof(struct pt_regs, fr[13]) +#define PT_FR14 offsetof(struct pt_regs, fr[14]) +#define PT_FR15 offsetof(struct pt_regs, fr[15]) +#define PT_FR16 offsetof(struct pt_regs, fr[16]) +#define PT_FR17 offsetof(struct pt_regs, fr[17]) +#define PT_FR18 offsetof(struct pt_regs, fr[18]) +#define PT_FR19 offsetof(struct pt_regs, fr[19]) +#define PT_FR20 offsetof(struct pt_regs, fr[20]) +#define PT_FR21 offsetof(struct pt_regs, fr[21]) +#define PT_FR22 offsetof(struct pt_regs, fr[22]) +#define PT_FR23 offsetof(struct pt_regs, fr[23]) +#define PT_FR24 offsetof(struct pt_regs, fr[24]) +#define PT_FR25 offsetof(struct pt_regs, fr[25]) +#define PT_FR26 offsetof(struct pt_regs, fr[26]) +#define PT_FR27 offsetof(struct pt_regs, fr[27]) +#define PT_FR28 offsetof(struct pt_regs, fr[28]) +#define PT_FR29 offsetof(struct pt_regs, fr[29]) +#define PT_FR30 offsetof(struct pt_regs, fr[30]) +#define PT_FR31 offsetof(struct pt_regs, fr[31]) +#define PT_SR0 offsetof(struct pt_regs, sr[ 0]) +#define PT_SR1 offsetof(struct pt_regs, sr[ 1]) +#define PT_SR2 offsetof(struct pt_regs, sr[ 2]) +#define PT_SR3 offsetof(struct pt_regs, sr[ 3]) +#define PT_SR4 offsetof(struct pt_regs, sr[ 4]) +#define PT_SR5 offsetof(struct pt_regs, sr[ 5]) +#define PT_SR6 offsetof(struct pt_regs, sr[ 6]) +#define PT_SR7 offsetof(struct pt_regs, sr[ 7]) +#define PT_IASQ0 offsetof(struct pt_regs, iasq[0]) +#define PT_IASQ1 offsetof(struct pt_regs, iasq[1]) +#define PT_IAOQ0 offsetof(struct pt_regs, iaoq[0]) +#define PT_IAOQ1 offsetof(struct pt_regs, iaoq[1]) +#define PT_CR27 offsetof(struct pt_regs, cr27) +#define PT_ORIG_R28 offsetof(struct pt_regs, orig_r28) +#define PT_KSP offsetof(struct pt_regs, ksp) +#define PT_KPC offsetof(struct pt_regs, kpc) +#define PT_SAR offsetof(struct pt_regs, sar) +#define PT_IIR offsetof(struct pt_regs, iir) +#define PT_ISR offsetof(struct pt_regs, isr) +#define PT_IOR offsetof(struct pt_regs, ior) --- insight-6.6.orig/gdb/hppa-linux-nat.c +++ insight-6.6/gdb/hppa-linux-nat.c @@ -31,11 +31,8 @@ #include <sys/ptrace.h> #include <linux/version.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,43) -#include <asm/offset.h> -#else -#include <asm/offsets.h> -#endif +#include <asm/ptrace.h> +#include "hppa-linux-offsets.h" #include "hppa-tdep.h"
Attachment:
signature.asc
Description: PGP signature