Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/perlmods
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv10496
Modified Files:
moose-pm.info mouse-pm.info
Added Files:
moose-pm.patch mouse-pm.patch
Log Message:
fix self-test on 32-bit
Index: moose-pm.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/perlmods/moose-pm.info,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- moose-pm.info 16 Jun 2010 11:39:53 -0000 1.28
+++ moose-pm.info 6 Aug 2010 19:06:58 -0000 1.29
@@ -14,6 +14,8 @@
#Source: mirror:cpan:authors/id/D/DR/DROLSKY/Moose-%v.tar.gz
Source: mirror:cpan:authors/id/D/DO/DOY/Moose-%v.tar.gz
Source-MD5: 1718719e7409b6ad16912382b5ea64ae
+PatchFile: %{ni}.patch
+PatchFile-MD5: 68d008320120c7d1fc526eee58438ebe
Type: perl (5.8.6 5.8.8 5.10.0)
UpdatePOD: true
@@ -32,7 +34,8 @@
<<
BuildDepends: <<
- extutils-makemaker-pm%type_pkg[perl] (>= 6.56-1)
+ extutils-makemaker-pm%type_pkg[perl] (>= 6.56-1),
+ fink (>= 0.24.12-1)
<<
InfoTest: TestDepends: test-exception-pm, test-output-pm%type_pkg[perl],
test-deep-pm%type_pkg[perl], module-refresh-pm, test-simple-pm%type_pkg[perl]
(>= 0.94-1), declare-constraints-simple-pm%type_pkg[perl]
@@ -41,4 +44,8 @@
%{default_script}
/bin/mv %i/share/man %i/lib/perl5/%type_raw[perl]
<<
+DescPackaging: <<
+ dmacks's wacky patch to make sure "universal" perl runs in
+ correct mode (fixes self-test failure on pm5100 10.6/i386).
+<<
<<
Index: mouse-pm.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/perlmods/mouse-pm.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- mouse-pm.info 31 Jul 2010 18:40:46 -0000 1.8
+++ mouse-pm.info 6 Aug 2010 19:06:59 -0000 1.9
@@ -23,6 +23,7 @@
class-mop-pm%type_pkg[perl],
declare-constraints-simple-pm%type_pkg[perl],
locale-us-pm,
+ moose-pm%type_pkg[perl],
mro-compat-pm%type_pkg[perl],
regexp-common-pm,
test-exception-pm,
@@ -45,6 +46,8 @@
Source: mirror:cpan:authors/id/G/GF/GFUJI/Mouse-%v.tar.gz
Source-MD5: 72ec389188ad456cfb01a27cd41b03b1
+PatchFile: %{ni}.patch
+PatchFile-MD5: 375f95cbb5bcb265ddf79ae38eb0f4c4
UseMaxBuildJobs: true
@@ -73,6 +76,9 @@
missing? depends:xsloader-pmXXX (newer than core; not in fink)
missing? testdepends: libwww-pmXXX, params-coerce-pmXXX, uri-pmXXX
missing? testdepends: Pod::Coverage::Moose (whole dep-tree not in fink)
+
+ dmacks's wacky patch to make sure "universal" perl runs in
+ correct mode (fixes self-test failure on pm5100 10.6/i386).
<<
<<
--- NEW FILE: moose-pm.patch ---
diff -Nurd Moose-1.08/t/010_basics/020-global-destruction.t
Moose-1.08-new/t/010_basics/020-global-destruction.t
--- Moose-1.08/t/010_basics/020-global-destruction.t 2010-06-11
19:58:38.000000000 -0400
+++ Moose-1.08-new/t/010_basics/020-global-destruction.t 2010-08-06
15:01:56.000000000 -0400
@@ -4,6 +4,7 @@
use warnings;
use Test::More;
+use Config;
{
package Foo;
@@ -43,9 +44,22 @@
my $bar = Bar->new;
}
+my $cmd = "$^X";
+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.
+ if ( $Config{"longsize"} == 4 ) {
+ $cmd = "/usr/bin/arch -i386 $cmd"; # 32-bit
+ } else {
+ $cmd = "/usr/bin/arch -x86_64 $cmd"; # 64-bit
+ }
+}
ok(
$_,
'in_global_destruction state is passed to DEMOLISH properly (true)'
-) for split //, `$^X t/010_basics/020-global-destruction-helper.pl`;
+) for split //, `$cmd t/010_basics/020-global-destruction-helper.pl`;
done_testing;
--- NEW FILE: mouse-pm.patch ---
diff -Nurd Mouse-0.59/t/010_basics/020-global-destruction.t
Mouse-0.59-new/t/010_basics/020-global-destruction.t
--- Mouse-0.59/t/010_basics/020-global-destruction.t 2010-02-22
00:51:07.000000000 -0500
+++ Mouse-0.59-new/t/010_basics/020-global-destruction.t 2010-08-06
14:54:27.000000000 -0400
@@ -4,6 +4,7 @@
use warnings;
use Test::More;
+use Config;
{
package Foo;
@@ -45,8 +46,21 @@
$? = 0;
+my $cmd = "$^X";
+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.
+ if ( $Config{"longsize"} == 4 ) {
+ $cmd = "/usr/bin/arch -i386 $cmd"; # 32-bit
+ } else {
+ $cmd = "/usr/bin/arch -x86_64 $cmd"; # 64-bit
+ }
+}
my $blib = $INC{'blib.pm'} ? ' -Mblib ' : '';
-my @status = `$^X $blib t/010_basics/020-global-destruction-helper.pl`;
+my @status = `$cmd $blib t/010_basics/020-global-destruction-helper.pl`;
ok $status[0], 'in_global_destruction state is passed to DEMOLISH properly
(true)';
ok $status[1], 'in_global_destruction state is passed to DEMOLISH properly
(true)';
------------------------------------------------------------------------------
This SF.net email is sponsored by
Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
