This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=c643a4d356a6425f4ebf862431edde5e588546b2 commit c643a4d356a6425f4ebf862431edde5e588546b2 Author: Guillem Jover <[email protected]> AuthorDate: Tue Nov 7 23:54:22 2023 +0100 dpkg-shlibdeps: Defer add_library_dir() calls after option parsing Otherwise this forces us to initialize the build-api version from the debian/control file before parsing the options, which means we require it to exist from the current working directory, even for options such as --version or --help. Changelog: internal --- scripts/dpkg-shlibdeps.pl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl index 3dac23e22..5f6925b44 100755 --- a/scripts/dpkg-shlibdeps.pl +++ b/scripts/dpkg-shlibdeps.pl @@ -72,6 +72,7 @@ my $ignore_missing_info = 0; my $warnings = WARN_SYM_NOT_FOUND | WARN_DEP_AVOIDABLE; my $debug = 0; my @exclude = (); +my @priv_lib_dirs = (); my @pkg_dir_to_search = (); my @pkg_dir_to_ignore = (); my $host_arch = get_host_arch(); @@ -91,7 +92,7 @@ foreach (@ARGV) { } elsif (m/^-L(.*)$/) { $shlibslocal = $1; } elsif (m/^-l(.*)$/) { - Dpkg::Shlibs::add_library_dir($1); + push @priv_lib_dirs, $1; } elsif (m/^-S(.*)$/) { push @pkg_dir_to_search, $1; } elsif (m/^-I(.*)$/) { @@ -163,6 +164,10 @@ if (-d 'debian') { push @pkg_root_dirs, keys %uniq; } +foreach my $libdir (@priv_lib_dirs) { + Dpkg::Shlibs::add_library_dir($libdir); +} + my $fields = $control->get_source(); my $bd_value = deps_concat($fields->{'Build-Depends'}, $fields->{'Build-Depends-Arch'}); my $build_deps = deps_parse($bd_value, build_dep => 1, reduce_restrictions => 1); -- Dpkg.Org's dpkg
