Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32053
Modified Files:
ChangeLog PkgVersion.pm Services.pm
Log Message:
Improved error when gcc_select fails.
Index: Services.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Services.pm,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- Services.pm 21 Mar 2005 06:13:13 -0000 1.155
+++ Services.pm 16 Apr 2005 16:14:58 -0000 1.156
@@ -1128,8 +1128,8 @@
sudo gcc_select GCC_SELECT_COMMAND
-(You may need to install a more recent version of the Developer Tools to be
-able to do so.)
+You may need to install a more recent version of the Developer Tools
+(Apple's XCode) to be able to do so.
=cut
@@ -1150,12 +1150,12 @@
my $sw_vers = get_sw_vers();
if ($sw_vers ne 0) {
$current_system = "Mac OS X $sw_vers";
- $sw_vers =~ s/^(\d*\.\d*).*/${1}/;
+ $sw_vers =~ s/^(\d*\.\d*).*/$1/;
$gcc = $osx_default{$sw_vers};
} else {
($dummy,$dummy,$darwin_version) = uname();
$current_system = "Darwin $darwin_version";
- $darwin_version =~ s/^(\d*).*/${1}/;
+ $darwin_version =~ s/^(\d*).*/$1/;
$gcc = $darwin_default{$darwin_version};
}
@@ -1165,9 +1165,13 @@
}
}
- chomp($gcc_select = `gcc_select`);
+ if (-x '/usr/sbin/gcc_select') {
+ chomp($gcc_select = `/usr/sbin/gcc_select`);
+ } else {
+ $gcc_select = '';
+ }
if (not $gcc_select =~ s/^.*gcc version (\S+)\s+.*$/$1/gs) {
- $gcc_select = 'an unknown version';
+ $gcc_select = '(unknown version)';
}
$gcc_command = $gcc_name{$gcc};
Index: PkgVersion.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -d -r1.378 -r1.379
--- PkgVersion.pm 15 Apr 2005 14:30:41 -0000 1.378
+++ PkgVersion.pm 16 Apr 2005 16:14:58 -0000 1.379
@@ -1823,8 +1823,8 @@
Fink::Services::enforce_gcc("This package must be compiled with GCC
EXPECTED_GCC, but you currently have\n" .
"GCC INSTALLED_GCC selected. To correct this problem, run the command:\n\n" .
" sudo gcc_select GCC_SELECT_COMMAND\n\n" .
-"(You may need to install a more recent version of the Developer Tools to
be\n" .
- "able to do so.)\n",
$gcc_abi);
+"You may need to install a more recent version of the Developer Tools\n" .
+"(Apple's XCode) to be able to do so.\n", $gcc_abi);
}
$bdir = $self->get_fullname();
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.932
retrieving revision 1.933
diff -u -d -r1.932 -r1.933
--- ChangeLog 15 Apr 2005 15:22:16 -0000 1.932
+++ ChangeLog 16 Apr 2005 16:14:57 -0000 1.933
@@ -1,3 +1,7 @@
+2005-04-16 Daniel Macks <[EMAIL PROTECTED]>
+
+ * PkgVersion.pm, Services.pm: Improved error when no gcc_select present.
+
2005-04-15 Daniel Macks <[EMAIL PROTECTED]>
* PkgVersion.pm: No interruption of buildlock pkg lookup
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
