From fc0dca465ff82cdf6590664864c7275c550bbf54 Mon Sep 17 00:00:00 2001 From: Shawn Laffan Date: Sat, 18 Mar 2023 19:49:36 +1100 Subject: [PATCH] Set PKG_CONFIG_PATH for cpan builds For some reason a number of the aliens are not picking up the system installs withou it. We could do it for each build that needs it but this is simpler overall as often the aliens are deep in dependency trees. This commit also corrects a config var name in the config update code. --- lib/Perl/Dist/Strawberry/Step.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Perl/Dist/Strawberry/Step.pm b/lib/Perl/Dist/Strawberry/Step.pm index 734ece4..416fc9c 100644 --- a/lib/Perl/Dist/Strawberry/Step.pm +++ b/lib/Perl/Dist/Strawberry/Step.pm @@ -439,6 +439,7 @@ sub _install_module { my $env = { PERL_MM_USE_DEFAULT=>1, AUTOMATED_TESTING=>undef, RELEASE_TESTING=>undef, PERL5_CPANPLUS_HOME=>$self->global->{build_ENV}->{APPDATA}, #workaround for CPANPLUS + PKG_CONFIG_PATH => ($self->global->{image_dir} . '/c/lib/pkgconf'), # just to be sure }; # resolve macros in env{} if (defined $args{env} && ref $args{env} eq 'HASH') { @@ -690,7 +691,7 @@ sub _get_default_config_hash { my $time = strftime "%a %b %e %H:%M:%S %Y", gmtime(); my $bits = $self->global->{bits}; my $app_version = $self->global->{app_version}; - $h->{my_uname} = "Win32 strawberry-perl $app_version # $time x${bits}"; + $h->{myuname} = "Win32 strawberry-perl $app_version # $time x${bits}"; # fix up quoting of values - saves a heap of editing foreach my $val (values %$h) {