[haiku-commits] Re: r35356 - haiku/trunk/src/bin/bash
- From: Matt Madia <mattmadia@xxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 31 Jan 2010 09:06:57 +0000
On Sun, Jan 31, 2010 at 08:51, <ingo_weinhold@xxxxxx> wrote:
> Author: bonefish
> Date: 2010-01-31 09:51:35 +0100 (Sun, 31 Jan 2010)
> New Revision: 35356
> Changeset: http://dev.haiku-os.org/changeset/35356/haiku
>
> Modified:
> haiku/trunk/src/bin/bash/Jamfile
> Log:
> Added missing builtext.h dependency declarations. The dependencies were
> introduced with the update to bash 4. That could cause the bash build to fail
> when built with multiple jobs. Thanks to Matt for investigating this!
>
>
> Modified: haiku/trunk/src/bin/bash/Jamfile
> ===================================================================
> --- haiku/trunk/src/bin/bash/Jamfile 2010-01-31 02:49:10 UTC (rev 35355)
> +++ haiku/trunk/src/bin/bash/Jamfile 2010-01-31 08:51:35 UTC (rev 35356)
> @@ -95,7 +95,7 @@
> Includes [ FGristFiles trap.c ] : <bash>signames.h ;
>
> # some sources include the generated builtext.h
> -Includes [ FGristFiles execute_cmd.c jobs.c parse.c trap.c ]
> +Includes [ FGristFiles execute_cmd.c nojobs.c jobs.c parse.c subst.c trap.c ]
> : <bash>builtext.h ;
>
> # y.tab.h includes parse.h
>
>
>
Even with this, I still need the following to successfully complete
jam -qj8 bash on a clean generated folder:
{{{
Index: src/bin/bash/builtins/Jamfile
===================================================================
--- src/bin/bash/builtins/Jamfile (revision 35306)
+++ src/bin/bash/builtins/Jamfile (working copy)
@@ -70,6 +70,8 @@
# generate builtext.h and builtins.c
MkBuiltinsExt <bash>builtext.h [ FGristFiles builtins.c ] : $(bashDefFiles) ;
+Depends "<src!bin!bash!builtins>builtins.o" :
"<src!bin!bash!builtins>builtins.c" ;
+
# generate the builtins library
StaticLibrary libbuiltins.a
: common.c evalfile.c evalstring.c getopt.c bashgetopt.c builtins.c
}}}
BTW, i was incorrect in my other email, the dependency is indeed in
the output of jam -q -dd bash, but for some reason without explicitly
mentioning it in bash/builtins/Jamfile, jam will fail (at least in
FreeBSD 8.0) I haven't tested this revision of Haiku in Haiku.
--mmadia
Other related posts:
