Skip to content

Commit

Permalink
Set PKG_CONFIG_PATH for cpan builds
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
shawnlaffan committed Mar 18, 2023
1 parent b2c88b5 commit fc0dca4
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lib/Perl/Dist/Strawberry/Step.pm
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit fc0dca4

Please sign in to comment.