Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/perlmods
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv6475
Modified Files:
test-harness-pm.info
Added Files:
test-harness-pm.patch
Removed Files:
test-harness-pm5100+.patch
Log Message:
unified internals for all variants (do version-test in code instead of
special-case patch
--- NEW FILE: test-harness-pm.patch ---
diff -Nurd -x'*~' Test-Harness-3.21.orig/lib/TAP/Parser/SourceHandler/Perl.pm
Test-Harness-3.21/lib/TAP/Parser/SourceHandler/Perl.pm
--- Test-Harness-3.21.orig/lib/TAP/Parser/SourceHandler/Perl.pm 2010-01-30
07:24:55.000000000 -0500
+++ Test-Harness-3.21/lib/TAP/Parser/SourceHandler/Perl.pm 2010-07-29
02:54:50.000000000 -0400
@@ -203,7 +203,21 @@
# XXX don't need to quote if we treat the parts as atoms (except maybe vms)
#$file = qq["$file"] if ( $file =~ /\s/ ) && ( $file !~ /^".*"$/ );
- my @command = ( $command, @switches, $file, @args );
+ my @command;
+ if ($] >= 5.010 && $Config{"byteorder"} =~ /^1/) {
+ # little-endian means intel (not powerpc), for which fink has
+ # multiple single-arch distros that are seen by a single (fat)
+ # perl interp from apple for a perl version supported by fink
+ # (i.e., starting with 5.10.0). This is the logic taken from
+ # Fink::PkgVersion as of fink-0.29.13.
+ push @command, '/usr/bin/arch';
+ if ( $Config{"longsize"} == 4 ) {
+ push @command, '-i386'; # 32-bit
+ } else {
+ push @command, '-x86_64'; # 64-bit
+ }
+ }
+ push @command, ($command, @switches, $file, @args);
return @command;
}
diff -Nurd -x'*~' Test-Harness-3.21.orig/t/proverun.t
Test-Harness-3.21/t/proverun.t
--- Test-Harness-3.21.orig/t/proverun.t 2010-01-30 07:24:55.000000000 -0500
+++ Test-Harness-3.21/t/proverun.t 2010-07-29 02:56:26.000000000 -0400
@@ -174,6 +174,11 @@
# obliterate it here. Need to test that it's sane.
for my $call (@log) {
if ( 'HASH' eq ref $call->[2] && exists $call->[2]->{command} ) {
+ if ($call->[2]->{command}->[0] eq '/usr/bin/arch') {
+ # nuke fink single-arch wrapper to actual perl interp
+ shift @{$call->[2]->{command}}; # '/usr/bin/arch'
+ shift @{$call->[2]->{command}}; # '-i386' or '-x86_64'
+ }
$call->[2]->{command}->[0] = 'PERL';
}
}
Index: test-harness-pm.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/perlmods/test-harness-pm.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- test-harness-pm.info 1 Aug 2010 05:37:47 -0000 1.14
+++ test-harness-pm.info 1 Aug 2010 16:56:34 -0000 1.15
@@ -1,7 +1,7 @@
Info2: <<
Package: test-harness-pm%type_pkg[perl]
Version: 3.21
-Revision: 103
+Revision: 104
Architecture: (%type_pkg[perl] = 581) powerpc, (%type_pkg[perl] = 584) powerpc
Distribution: (%type_pkg[perl] = 581) 10.4, (%type_pkg[perl] = 584) 10.4,
(%type_pkg[perl] = 586) 10.4, (%type_pkg[perl] = 586) 10.5, (%type_pkg[perl] =
5100) 10.5, (%type_pkg[perl] = 5100) 10.6
Type: perl (5.8.1 5.8.4 5.8.6 5.8.8 5.10.0)
@@ -12,14 +12,8 @@
Source: mirror:cpan:authors/id/A/AN/ANDYA/Test-Harness-%v.tar.gz
Source-MD5: 74c6de5202456484c186ba92af4f1474
-PatchFile: %{ni}5100+.patch
-PatchFile-MD5: 2e0969f8270c938142721b7668b7d118
-PatchScript: <<
-#!/bin/sh -ex
- if dpkg --compare-versions "%type_raw[perl]" ">=" "5.10.0" ; then
- patch -p1 < %{PatchFile}
- fi
-<<
+PatchFile: %{ni}.patch
+PatchFile-MD5: 7240ea17a0cac52f9ee8b7c2245ec197
InstallScript: <<
%{default_script}
@@ -42,7 +36,7 @@
This package has language-version variants for historical reasons.
<<
DescPort: <<
- This package has hacks for the pm5100 (and beyond) variant to
+ This package has hacks for pm5100 on intel-based machines to
enforce correct single-arch from fat perl interp. See:
http://permalink.gmane.org/gmane.os.apple.fink.devel/19640 and
inline comments in the patchfile
--- test-harness-pm5100+.patch DELETED ---
------------------------------------------------------------------------------
The Palm PDK Hot Apps Program offers developers who use the
Plug-In Development Kit to bring their C/C++ apps to Palm for a share
of $1 Million in cash or HP Products. Visit us here for more details:
http://p.sf.net/sfu/dev2dev-palm
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
