svn is broken [was: Re: [PATCH] store --help messages in
compressed form. saves 35k]
Rob Landley
rob at landley.net
Fri May 5 15:15:48 PDT 2006
On Friday 05 May 2006 5:24 pm, Bernhard Fischer wrote:
> On Fri, May 05, 2006 at 03:52:42PM -0400, Rob Landley wrote:
> >On Friday 05 May 2006 2:09 pm, Jason Schoon wrote:
> >> > I'd be surprised if it would build out of tree for you but not for me.
> >> > Did you actually try the sequence i did show?
> >> > Just set src=/there/are/the/sources/of/busybox and invoke the
> >> > standard sequence as in my previous mail.
> >>
> >> Okay, you just answered my question. I'm not trying to build out of
> >> tree, that would explain it.
> >
> >It's the Rules.mak part of svn 14960, and I have _no_idea_ what that patch
> > is
>
> From the looks, usage.c wants to #include "bb_config.h" (via busybox.h),
> but it is compiled as
>
> --- trunk/busybox/Makefile 2006/04/26 10:10:25 14943
> +++ trunk/busybox/Makefile 2006/04/27 23:34:46 14949
> @@ -405,6 +405,13 @@
> $(Q)$(top_srcdir)/scripts/config/mkconfigs > $@
> endif
>
> +scripts/usage: $(top_srcdir)/scripts/usage.c .config
> + $(HOSTCC) $(HOSTCFLAGS) -I$(top_srcdir)/include -o $@ $<
> +
> +DEP_INCLUDES += include/usage_compressed.h
> +include/usage_compressed.h: .config scripts/usage
> + $(Q)sh $(top_srcdir)/scripts/usage_compressed
> "$(top_srcdir)/scripts" > $@
> +
> depend dep: .depend
> .depend: scripts/bb_mkdep $(DEP_INCLUDES)
> $(disp_gen)
>
>
> So it naturally fails to find bb_config.h which lives in the
> $(top_builddir)/include
>
> I didn't look how 14960 could possibly have causes this breakage,
> though, and TBH i don't quite see how 14960 comes into play either.
All I know is:
svn update Rules.mak -r 14959
That builds
svn update Rules.mak -r 14960
That breaks.
The diff is this:
svn diff Rules.mak -r 14959:14960 | less
And it's solidly in a part of the build infrastructure that's still black
magic to me (and I think is just plain black magic anyway), and I have _no_
idea what's going on.
What was the patch trying to do, anyway? What problem was 14960 trying to
fix, or what feature was it trying to add? I found the description
unenlightening...
Rob
--
Never bet against the cheap plastic solution.
More information about the busybox
mailing list