Re: gdb-arm fails to install
+++ Neil Williams [2009-06-09 14:35 +0100]:
> On Tue, 9 Jun 2009 13:52:49 +0100
> Wookey <wookey@wookware.org> wrote:
>
> > If someone who understands cdbs agrees this is the right fix then I'll
> > file it as a bug:
>
> (I haven't built the package, just looking over the patch and
> original debian/rules file from a CDBS perspective.)
>
> > --- rules.orig 2009-06-09 11:00:39.000000000 +0100
> > +++ rules 2009-06-09 13:49:36.000000000 +0100
> > @@ -159,9 +159,9 @@
> > binary-post-install/gdb$(TS) ::
> > if [ -x debian/tmp/usr/bin/run ]; then \
> > mv debian/tmp/usr/bin/run \
> > - debian/gdb$(TS)/usr/bin/$(DEB_TARGET_ALIAS)-run; \
> > + debian/gdb$(TS)/usr/bin/$(TP)run; \
>
> In the section above, TP is defined as:
> TP=$(DEB_TARGET_ALIAS)-
> so this line makes no change whatsoever AFAICT.
>
> > mv debian/tmp/usr/share/man/man1/run.1 \
> > - debian/gdb$(TS)/usr/share/man/man1/$(DEB_TARGET_ALIAS)-run.1; \
> > + debian/gdb$(TS)/usr/share/man/man1/$(TP)run.1; \
>
> Same here.
Yes - that's just a style change to make it match the rest of the
rules file: $(TP) (prefix) is defined at the top from
$(DEB_TARGET_ALIAS) for this exact purpose but for some reason someone
failed to use it, despite using $(TS) (suffix) on the same line.
yes I should have put this in a separate patch, but I just fixed it
when I saw it.
> > fi
> > ifeq ($(run_tests),yes)
> > install -d debian/gdb$(TS)/usr/share/doc/gdb
> > @@ -212,7 +212,6 @@
> > DEB_INSTALL_DOCS_gdb$(TS) = gdb/NEWS gdb/README gdb/doc/refcard.tex \
> > objdir/gdb/doc/refcard.dvi objdir/gdb/doc/refcard.ps
> > DEB_INSTALL_CHANGELOGS_gdb$(TS) = gdb/ChangeLog
> > -DEB_INSTALL_MANPAGES_gdb$(TS) = gdb/gdb.1
>
> that would, presumably, drop the manpage from the native build too
> (where $(TS) is undefined).
You'd think so wouldn't you, but in fact both the native and cross
builds end up with a man page (and the cross build even has it
correctly named gdb$(TS) ). I really don't understand how.
(anyone care to check the native with this patch on a fresh build - it
did seem to work here - but note that you can't do a cross build and
then revert to native without re-downloading/copying the original
sources and build tree - stuff gets changed and left behind by the
target reconfiguration of control and install files and there seems to
be no way to revert short of bining it all)
<fx: I have just done this again - I have built gdb _soooo_ many times
in the last 24 hrs - and it really does produce the correct manpages in
a clean native build so I think that line is just wrong/superfluous>
> might it be better to put:
>
> > ifneq ($(DEB_CROSS),yes)
> > DEB_INSTALL_MANPAGES_gdb$(TS) += debian/gcore.1
> +DEB_INSTALL_MANPAGES_gdb$(TS) = gdb/gdb.1
> > endif
That would be better yes, if I am wrong about my fix not
breaking the native build. But in fact that line seems to be unecessary.
Wookey
--
Principal hats: iEndian - Balloonboard - Toby Churchill - Emdebian
http://wookware.org/
Reply to: