[llvm-commits] CVS: llvm/tools/llvm-config/Makefile find-cycles.pl llvm-config.in.in

[Reid Spencer]

Anton,

Part of this patch is incorrect, please see below ..

On Fri, 2006-08-04 at 16:52 -0500, Anton Korobeynikov wrote:
>  
>  $(LibDeps): $(GenLibDeps) $(LibDir) $(wildcard $(LibDir)/*.a $(LibDir)/*.o)
>  	$(Echo) "Regenerating LibDeps.txt"
> -	$(Verb) $(GenLibDeps) -flat $(LibDir) $(NM_PATH) | sort > $(LibDeps)
> +	$(Verb) $(GenLibDeps) -flat $(LibDir) $(NM_PATH)

The output still needs to go to $(LibDeps). You've changed it to go to
stdout. Please correct this quickly as it could break the build.

> Index: llvm/tools/llvm-config/find-cycles.pl
> diff -u llvm/tools/llvm-config/find-cycles.pl:1.5 llvm/tools/llvm-config/find-cycles.pl:1.6
> --- llvm/tools/llvm-config/find-cycles.pl:1.5	Thu Aug  3 16:46:42 2006
> +++ llvm/tools/llvm-config/find-cycles.pl	Fri Aug  4 16:52:23 2006
> @@ -29,7 +29,7 @@
>  # Read our dependency information.
>  while (<>) {
>      chomp;
> -    my ($module, $dependency_str) = /^([^:]*): ?(.*)$/;
> +    my ($module, $dependency_str) = /^\s*([^:]+):\s*(.*)\s*$/;

Looks good.

>      die "Malformed data: $_" unless defined $dependency_str;
>      my @dependencies = split(/ /, $dependency_str);
>      $DEPS{$module} = \@dependencies;
> 
> 
> Index: llvm/tools/llvm-config/llvm-config.in.in
> diff -u llvm/tools/llvm-config/llvm-config.in.in:1.20 llvm/tools/llvm-config/llvm-config.in.in:1.21
> --- llvm/tools/llvm-config/llvm-config.in.in:1.20	Thu Aug  3 16:45:35 2006
> +++ llvm/tools/llvm-config/llvm-config.in.in	Fri Aug  4 16:52:23 2006
> @@ -275,7 +275,7 @@
>      $DEPENDENCIES_LOADED = 1;
>      while (<DATA>) {
>          # Parse our line.
> -        my ($libs, $deps) = /^\s*([^:]+):\s+(.*)\s*$/;
> +        my ($libs, $deps) = /^\s*([^:]+):\s*(.*)\s*$/;

Looks good.

>          die "Malformed dependency data" unless defined $deps;
>          my @libs = split(' ', $libs);
>          my @deps = split(' ', $deps);

Thanks, Anton.