58 lines
1.8 KiB
Diff
58 lines
1.8 KiB
Diff
From f579b535e68977bab6547ac58a0fe62791ea2309 Mon Sep 17 00:00:00 2001
|
|
From: Slaven Rezic <slaven@rezic.de>
|
|
Date: Thu, 6 Nov 2014 20:02:45 +0000
|
|
Subject: [PATCH] Tk::MMutil: use $^X instead of $self->{PERL}
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Since ExtUtils::MakeMaker 6.99_10, the PERL object member is quoted.
|
|
This caused the subsequent extraction commands to be run with an
|
|
invalid command (the perl binary *with* quotes). Unfortunately
|
|
this system() call failed silently, so the real problem showed
|
|
up in a strange dependency problem, see
|
|
https://rt.cpan.org/Ticket/Display.html?id=100044
|
|
|
|
Instead of $self->{PERL}, now simply $^X is used. Also, the
|
|
extraction commands do not fail silently anymore.
|
|
|
|
Reference to the EUMM ticket:
|
|
https://rt.cpan.org/Ticket/Display.html?id=100159
|
|
|
|
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|
---
|
|
Tk/MMutil.pm | 12 ++++--------
|
|
1 file changed, 4 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/Tk/MMutil.pm b/Tk/MMutil.pm
|
|
index 7a78c1b..6df5c70 100644
|
|
--- a/Tk/MMutil.pm
|
|
+++ b/Tk/MMutil.pm
|
|
@@ -115,19 +115,15 @@ sub mTk_CHO
|
|
$self->{O_FILES} = [grep s/\.c(pp|xx|c)?$/$self->{OBJ_EXT}/i, @o_files] ;
|
|
$self->{'MTK'} = $mTk;
|
|
my $tk = installed_tk();
|
|
- my $perl = $self->{'PERL'};
|
|
- if ($IsWin32 && !-f $perl && -f "$perl.exe")
|
|
- {
|
|
- print "perl=$perl X=$^X\n";
|
|
- $perl = "$perl.exe";
|
|
- $self->{'PERL'} = $perl;
|
|
- }
|
|
+ my $perl = $^X;
|
|
foreach my $file (sort keys %$mTk)
|
|
{
|
|
unless (-f $file && -M $file < -M $mTk->{$file})
|
|
{
|
|
warn "Extracting $file\n";
|
|
- system($perl,"$tk/pTk/Tcl-pTk",$mTk->{$file},$file);
|
|
+ my @cmd = ($perl,"$tk/pTk/Tcl-pTk",$mTk->{$file},$file);
|
|
+ system @cmd;
|
|
+ die "The command '@cmd' failed with $?" if $? != 0;
|
|
}
|
|
}
|
|
}
|
|
--
|
|
1.9.3
|
|
|