fink/perlmod/Fink ChangeLog,1.873.2.46,1.873.2.47 Services.pm,1.152.2.4,1.152.2.5

[Matthew Sachs]

Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14131

Modified Files:
      Tag: branch_0_24
        ChangeLog Services.pm 
Log Message:
* Services.pm: Backport fix for looser checking of GCC version.


Index: Services.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Services.pm,v
retrieving revision 1.152.2.4
retrieving revision 1.152.2.5
diff -u -d -r1.152.2.4 -r1.152.2.5
--- Services.pm 13 Jul 2005 02:09:31 -0000      1.152.2.4
+++ Services.pm 13 Jul 2005 02:24:10 -0000      1.152.2.5
@@ -1099,7 +1099,8 @@
                '2.95' => '2',
                '3.1' => '3',
                '3.3' => '3.3',
-               '4.0.0' => '4.0'
+               '4.0.0' => '4.0',
+               '4.0.1' => '4.0'
        );
        
        sub gcc_select_arg {
@@ -1179,9 +1180,9 @@
 # Note: we no longer support 10.1 or 10.2-gcc3.1 in fink, we don't
 # specify default values for these.
 
-       my %osx_default = ('10.2' => '3.3', '10.3' => '3.3', '10.4' => '4.0.0');
-       my %darwin_default = ('6' => '3.3', '7' => '3.3', '8' => '4.0.0');
-       my %gcc_abi_default = ('2.95' => '2.95', '3.1' => '3.1', '3.3' => 
'3.3', '4.0.0' => '3.3');
+       my %osx_default = ('10.2' => '3.3', '10.3' => '3.3', '10.4' => '4.0');
+       my %darwin_default = ('6' => '3.3', '7' => '3.3', '8' => '4.0');
+       my %gcc_abi_default = ('2.95' => '2.95', '3.1' => '3.1', '3.3' => 
'3.3', '4.0' => '3.3');
 
        my $sw_vers = get_sw_vers();
        if ($sw_vers ne 0) {
@@ -1202,6 +1203,7 @@
        }
 
        $gcc_select = gcc_selected() || '(unknown version)';
+       $gcc_select =~ s/(\d+\.\d+)\.\d+/$1/;
 
        if ($gcc_select !~ /^$gcc/) {
                my $gcc_name = gcc_select_arg($gcc);

Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.873.2.46
retrieving revision 1.873.2.47
diff -u -d -r1.873.2.46 -r1.873.2.47
--- ChangeLog   13 Jul 2005 02:09:29 -0000      1.873.2.46
+++ ChangeLog   13 Jul 2005 02:24:08 -0000      1.873.2.47
@@ -1,3 +1,7 @@
+2005-07-12  Matthew Sachs  <[EMAIL PROTECTED]>
+
+       * Services.pm: Backport fix for looser checking of GCC version.
+
 2005-07-12  Dave Vasilevsky  <[EMAIL PROTECTED]>
 
        * Services.pm, PkgVersion.pm: Backport fix for after Repair Perms screws



-------------------------------------------------------
This SF.Net email is sponsored by the 'Do More With Dual!' webinar happening
July 14 at 8am PDT/11am EDT. We invite you to explore the latest in dual
core and dual graphics technology at this free one hour event hosted by HP, 
AMD, and NVIDIA.  To register visit http://www.hp.com/go/dualwebinar
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits