Update of /cvsroot/fink/fink/perlmod/Fink In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv1086
Modified Files: Tag: branch_0_24 ChangeLog VirtPackage.pm Log Message: rewrite 64bit-cpu to work with both ppc and intel Index: VirtPackage.pm =================================================================== RCS file: /cvsroot/fink/fink/perlmod/Fink/VirtPackage.pm,v retrieving revision 1.68.2.20 retrieving revision 1.68.2.21 diff -u -d -r1.68.2.20 -r1.68.2.21 --- VirtPackage.pm 20 Jul 2006 15:17:12 -0000 1.68.2.20 +++ VirtPackage.pm 10 Aug 2006 18:40:34 -0000 1.68.2.21 @@ -166,23 +166,13 @@ =cut my $cpu; -print STDERR "- checking for 64bit-cpu... cpu type is " if ($options{debug}); -if (-x "/usr/bin/machine") { - $cpu = `/usr/bin/machine`; - chomp $cpu; -} else { - $cpu = "unknown"; -} - print STDERR "$cpu..." if ($options{debug}); -# possible values seem to be: -# ppc750 (G3, not 64bit capable) -# ppc7450 (G4, not 64bit capable) -# ppc970 (G5, 64bit capable) -# i486 (early intel macs, not 64bit capable) +print STDERR "- checking for 64bit-cpu... " if ($options{debug}); $hash = {}; $hash->{package} = "64bit-cpu"; - if ($cpu eq "ppc970") { + +# different sysctl variables for intel and ppc + if ((`sysctl hw.optional.x86_64 2>/dev/null`) or (`sysctl hw.optional.64bitops 2>/dev/null`)) { print STDERR "64 bit capable\n" if ($options{debug}); $hash->{status} = STATUS_PRESENT; } else { Index: ChangeLog =================================================================== RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v retrieving revision 1.873.2.114 retrieving revision 1.873.2.115 diff -u -d -r1.873.2.114 -r1.873.2.115 --- ChangeLog 9 Aug 2006 21:34:16 -0000 1.873.2.114 +++ ChangeLog 10 Aug 2006 18:40:34 -0000 1.873.2.115 @@ -1,3 +1,7 @@ +2006-08-10 Dave Morrison <[EMAIL PROTECTED]> + + * VirtPackage.pm: rewrite 64bit-cpu to work with both ppc and intel + 2006-08-09 Dave Morrison <[EMAIL PROTECTED]> * Services.pm: prepare for the future ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits