Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/perlmods
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30497
Modified Files:
dist-checkconflicts-pm.info
Added Files:
dist-checkconflicts-pm.patch
Log Message:
Fix tests on 10.6/i386.
--- NEW FILE: dist-checkconflicts-pm.patch ---
diff -ru Dist-CheckConflicts-0.02.orig/t/00-compile.t
Dist-CheckConflicts-0.02/t/00-compile.t
--- Dist-CheckConflicts-0.02.orig/t/00-compile.t 2011-01-02
09:20:32.000000000 -0500
+++ Dist-CheckConflicts-0.02/t/00-compile.t 2013-06-15 21:25:10.000000000
-0400
@@ -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: dist-checkconflicts-pm.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/perlmods/dist-checkconflicts-pm.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dist-checkconflicts-pm.info 1 Jul 2012 02:39:54 -0000 1.2
+++ dist-checkconflicts-pm.info 16 Jun 2013 01:32:34 -0000 1.3
@@ -11,6 +11,9 @@
Source: mirror:cpan:authors/id/D/DO/DOY/Dist-CheckConflicts-%v.tar.gz
Source-MD5: 64b8d342ba11336b2969c274a60bbc5f
+PatchFile: %{ni}.patch
+PatchFile-MD5: 9bdfb4c7e3207d933653976a20da54fa
+
Type: perl (5.8.6 5.8.8 5.10.0 5.12.3 5.12.4)
UpdatePOD: true
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
