From a993958324232eea0cbca6492015eb9ad82dbbd0 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Tue, 10 Dec 2024 02:35:40 +0800 Subject: [PATCH] buildEnv: fix bulder.pl (addPkg argument ignoreSingleFileOutputs) Specify the ignoreSingleFileOutputs parameter wherever calling addPkg. --- pkgs/build-support/buildenv/builder.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index b620a89aee8fe..7953032b09a78 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -240,6 +240,7 @@ sub addPkg { for my $path (@{$pkg->{paths}}) { addPkg($path, $ENV{"ignoreCollisions"} eq "1", + $ENV{"ignoreSingleFileOutputs"} eq "1", $ENV{"checkCollisionContents"} eq "1", $pkg->{priority}) if -e $path; @@ -256,7 +257,7 @@ sub addPkg { my @pkgDirs = keys %postponed; %postponed = (); foreach my $pkgDir (sort @pkgDirs) { - addPkg($pkgDir, 2, $ENV{"checkCollisionContents"} eq "1", $priorityCounter++); + addPkg($pkgDir, 2, $ENV{"ignoreSingleFileOutputs"} eq "1", $ENV{"checkCollisionContents"} eq "1", $priorityCounter++); } } @@ -268,6 +269,7 @@ sub addPkg { chomp $line; addPkg($line, $ENV{"ignoreCollisions"} eq "1", + $ENV{"ignoreSingleFileOutputs"} eq "1", $ENV{"checkCollisionContents"} eq "1", 1000) if -d $line;