diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-02-26 20:11:52 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:26:38 +1000 |
| commit | cada19f58b3f721a1d7a02afed038e32a3ca8945 (patch) | |
| tree | 20a77c5a7f4103de514e830f1515638651f4aab5 | |
| parent | f15a81c1c02426a5afe59a364d00438f06a10501 (diff) | |
| download | samba-cada19f58b3f721a1d7a02afed038e32a3ca8945.tar.gz samba-cada19f58b3f721a1d7a02afed038e32a3ca8945.tar.bz2 samba-cada19f58b3f721a1d7a02afed038e32a3ca8945.zip | |
build: cope with empty source lists for libs
| -rwxr-xr-x | buildtools/mktowscript/mktowscript.pl | 7 | ||||
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py (renamed from lib/replace/wafsamba.py) | 0 |
2 files changed, 6 insertions, 1 deletions
diff --git a/buildtools/mktowscript/mktowscript.pl b/buildtools/mktowscript/mktowscript.pl index 68fb7c69d3..5b3926065a 100755 --- a/buildtools/mktowscript/mktowscript.pl +++ b/buildtools/mktowscript/mktowscript.pl @@ -263,6 +263,7 @@ sub process_results($) printf "\nbld.SAMBA_%s('%s'", $sec->{TYPE}, $s; my $trailer=""; my $got_src = 0; + my $got_private_deps = 0; foreach my $k (keys %{$sec}) { #print "key=$k\n"; @@ -293,6 +294,7 @@ sub process_results($) } if ($k eq "PRIVATE_DEPENDENCIES") { $trailer .= sprintf(",\n\tdeps='%s'", strlist($sec->{$k})); + $got_private_deps = 1; next; } if ($k eq "PUBLIC_DEPENDENCIES") { @@ -422,7 +424,10 @@ sub process_results($) } die("Unknown keyword $k in $s\n"); } - die("No source list in $s\n") unless $got_src; + die("No source list in $s\n") unless $got_src or $got_private_deps; + if (! $got_src) { + printf(",''\n\t"); + } printf("%s\n\t)\n\n", $trailer); } } diff --git a/lib/replace/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 54c1235ef3..54c1235ef3 100644 --- a/lib/replace/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py |