Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/perlmods
In directory vz-cvs-3.sog:/tmp/cvs-serv29790

Modified Files:
        cpan-meta-pm.info cpan-meta-requirements-pm.info 
Added Files:
        cpan-meta-pm.patch 
Log Message:
Add the usual patch to fix 00-compile.t on 10.6/i386.


--- NEW FILE: cpan-meta-pm.patch ---
diff -Nurd -x'*~' Package-Stash-XS-0.18.orig/t/00-compile.t 
Package-Stash-XS-0.18/t/00-compile.t
--- Package-Stash-XS-0.18.orig/t/00-compile.t   2011-01-05 14:18:07.000000000 
-0500
+++ Package-Stash-XS-0.18/t/00-compile.t        2011-01-06 01:09:26.000000000 
-0500
@@ -6,6 +6,7 @@
 use Test::More;
 use File::Find;
 use File::Temp qw{ tempdir };
+use Config;
 
 my @modules;
 find(
@@ -30,7 +31,21 @@
     # fake home for cpan-testers
     # no fake requested ## local $ENV{HOME} = tempdir( CLEANUP => 1 );
 
-    like( qx{ $^X -Ilib -e "require $_; print '$_ ok'" }, qr/^\s*$_ ok/s, "$_ 
loaded ok" )
+    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
+        }
+    }
+    like( qx{ @command $^X -Ilib -e "require $_; print '$_ ok'" }, qr/^\s*$_ 
ok/s, "$_ loaded ok" )
         for sort @modules;
 
     SKIP: {

Index: cpan-meta-pm.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/perlmods/cpan-meta-pm.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cpan-meta-pm.info   17 Jul 2012 14:27:57 -0000      1.10
+++ cpan-meta-pm.info   17 Jul 2012 16:15:27 -0000      1.11
@@ -14,13 +14,8 @@
 Type: perl (5.8.6 5.8.8 5.10.0 5.12.3 5.12.4)
 UpdatePOD: true
 
-PatchScript: <<
-       #!/bin/bash -ev
-       darwinvers=`uname -r | cut -f 1 -d .`
-       if [ $darwinvers = 10 ]; then
-               perl -pi -e 's,\$\^X,/usr/bin/arch -%m \$^X,' t/00-compile.t
-       fi
-<<
+PatchFile: %{ni}.patch
+PatchFile-MD5: 61c43eabae4f0f8ad7dfeda12386d44a
 
 Depends: <<
        cpan-meta-requirements-pm%type_pkg[perl],

Index: cpan-meta-requirements-pm.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/perlmods/cpan-meta-requirements-pm.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cpan-meta-requirements-pm.info      17 Jul 2012 15:32:05 -0000      1.2
+++ cpan-meta-requirements-pm.info      17 Jul 2012 16:15:27 -0000      1.3
@@ -14,13 +14,8 @@
 Type: perl (5.8.6 5.8.8 5.10.0 5.12.3 5.12.4)
 UpdatePOD: true
 
-PatchScript: <<
-       #!/bin/bash -ev
-       darwinvers=`uname -r | cut -f 1 -d .`
-       if [ $darwinvers = 10 ]; then
-               perl -pi -e 's,\$\^X,/usr/bin/arch -%m \$^X,' t/00-compile.t
-       fi
-<<
+PatchFile: cpan-meta-pm.patch
+PatchFile-MD5: 61c43eabae4f0f8ad7dfeda12386d44a
 
 Depends: <<
        version-pm%type_pkg[perl] (>= 1:0.88-1),


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to