Ticket #1732: versiononly.patch

File versiononly.patch, 2.4 KB (added by cotto, 4 years ago)
  • config/init/defaults.pm

     
    5353    # 
    5454    # This is a multi-stage process. 
    5555 
     56    # Some checks (e.g. auto::pod2man) search for perl executables in scriptdirexp, but these may 
     57    # have a suffix (and no suffixless alias), e.g. under perlblew: 
     58    #    $ readlink $(which perl) 
     59    #    /home/v-perlbrew/perl5/perlbrew/perls/current/bin/perl5.13.2 
     60    #    $ file /home/v-perlbrew/perl5/perlbrew/perls/current/bin/pod2man 
     61    #    ERROR: cannot open `/home/v-perlbrew/perl5/perlbrew/perls/current/bin/pod2man' (No such file or directory) 
     62    #    $ file /home/v-perlbrew/perl5/perlbrew/perls/current/bin/pod2man5.13.2 
     63    #    /home/v-perlbrew/perl5/perlbrew/perls/current/bin/pod2man5.13.2: a /home/v-perlbrew/perl5/perlbrew script text executable 
     64    my $perl_bin_suffix = $Config{versiononly} ? $Config{version} : ''; 
     65    $conf->data->set( qq|perl_bin_suffix_provisional| => $perl_bin_suffix ); 
     66 
    5667    # Stage 1: 
    5768    foreach my $orig ( qw| 
    5869        archname 
  • config/auto/pod2man.pm

     
    3434sub runstep { 
    3535    my ( $self, $conf ) = @_; 
    3636 
    37     my $cmd = $conf->data->get('scriptdirexp_provisional') . q{/pod2man}; 
     37    my $slash = $conf->data->get('slash'); 
     38    my $suffix = $conf->data->get('perl_bin_suffix_provisional'); 
     39    my $cmd = $conf->data->get('scriptdirexp_provisional') . $slash . q{pod2man} . $suffix; 
    3840    my $content = capture_output("$cmd docs/parrot.pod") || undef; 
    3941 
    4042    return 1 unless defined( $self->_initial_content_check($conf, $content) ); 
  • config/auto/perldoc.pm

     
    3737    my ( $self, $conf ) = @_; 
    3838 
    3939    my $slash = $conf->data->get('slash'); 
    40     my $cmd = $conf->data->get('scriptdirexp_provisional') . $slash . q{perldoc}; 
     40    my $suffix = $conf->data->get('perl_bin_suffix_provisional'); 
     41    my $cmd = $conf->data->get('scriptdirexp_provisional') . $slash . q{perldoc} . $suffix; 
    4142    my ( $fh, $filename ) = tempfile( UNLINK => 1 ); 
    4243    my $content = capture_output("$cmd -ud $filename perldoc") || undef; 
    4344