Update of /cvsroot/fink/fink/perlmod/Fink
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28726

Modified Files:
        ChangeLog Validation.pm 
Log Message:
allow -64bit type under x86_64; also, the default value for the Shlibs
architecture field depend on the fink Architecture


Index: Validation.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Validation.pm,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -d -r1.307 -r1.308
--- Validation.pm       8 Apr 2009 05:19:21 -0000       1.307
+++ Validation.pm       9 Apr 2009 05:20:19 -0000       1.308
@@ -492,6 +492,9 @@
                                        $expand->{"lib"} = "lib/ppc64";
                                } elsif ($config->param('Architecture') eq 
"i386" ) {
                                        $expand->{"lib"} = "lib/x86_64";
+                               } elsif ($config->param('Architecture') eq 
"x86_64" ) {
+                                       print "Warning: the -64bit type may 
have unexpected effects under x86_64 Architecture. ($filename)\n";
+                                       $looks_good = 0;
                                } else {
                                        die "Your Architecture is not suitable 
for 64bit libraries.\n";
                                }
@@ -1264,8 +1267,12 @@
                                $looks_good = 0;
                        }
                        my @shlib_deps = split /\s*\|\s*/, $shlibs_parts[2], -1;
-                       # default value of $libarch, if absent, is "32"
+                       # default value of $libarch, if absent, is "32" for the
+                       # powerpc and i386 architectures, and "64" for x86_64
                        my $libarch = "32";
+                       if ($config->param('Architecture') eq "x86_64" ) {
+                               $libarch = "64";
+                       }
                        # strip off the end of the last @shlib_deps entry (the 
stuff
                        # beyond the final close-paren), which should consist 
of digits
                        # and "-" only, and use as $libarch

Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1598
retrieving revision 1.1599
diff -u -d -r1.1598 -r1.1599
--- ChangeLog   8 Apr 2009 05:19:21 -0000       1.1598
+++ ChangeLog   9 Apr 2009 05:20:19 -0000       1.1599
@@ -1,3 +1,9 @@
+2009-04-08  Dave Morrison  <[email protected]>
+
+       * Validation.pm: allow -64bit type under x86_64
+       * Validation.pm: make the default value for the Shlibs architecture
+       field depend on the fink Architecture
+
 2009-04-08  Daniel Macks  <[email protected]>
 
        * Validation.pm: Only print first occurrence of each bad gtk-doc


------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to