Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28359/perlmod/Fink
Modified Files:
Bootstrap.pm ChangeLog
Log Message:
* Don't fall through to 10.2 for i386-apple-darwin8.FOO for
values of FOO which we don't know about.
Index: Bootstrap.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Bootstrap.pm,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- Bootstrap.pm 12 Aug 2005 19:15:49 -0000 1.117
+++ Bootstrap.pm 19 Aug 2005 01:44:35 -0000 1.118
@@ -188,7 +188,12 @@
"this Fink release was made. Prerelease versions " .
"of Mac OS X might work with Fink, but there are no " .
"guarantees.");
- $distribution = "10.4-transitional";
+ if($ENV{FINK_NOTRANS}) {
+ &print_breaking("Using the non-transitional tree...");
+ $distribution = "10.4";
+ } else {
+ $distribution = "10.4-transitional";
+ }
} elsif ($host =~ /^i386-apple-darwin8\.[0-2]\.[0-1]/) {
&print_breaking("Fink is currently not supported on x86 ".
"Darwin. Various parts of Fink hardcode 'powerpc' ".
@@ -200,6 +205,17 @@
} else {
$distribution = "10.4-transitional";
}
+ } elsif ($host =~ /^i386-apple-darwin[8-9]\./) {
+ &print_breaking("This system was not released at the time " .
+ "this Fink release was made. Prerelease versions " .
+ "of Mac OS X might work with Fink, but there are no " .
+ "guarantees. Also, x86 is not currently supported.");
+ if($ENV{FINK_NOTRANS}) {
+ &print_breaking("Using the non-transitional tree...");
+ $distribution = "10.4";
+ } else {
+ $distribution = "10.4-transitional";
+ }
} elsif ($host =~ /^i386-apple-darwin7\.[0-2]\.[0-1]/) {
&print_breaking("Fink is currently not supported on x86 ".
"Darwin. Various parts of Fink hardcode 'powerpc' ".
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1090
retrieving revision 1.1091
diff -u -d -r1.1090 -r1.1091
--- ChangeLog 15 Aug 2005 02:11:01 -0000 1.1090
+++ ChangeLog 19 Aug 2005 01:44:36 -0000 1.1091
@@ -1,3 +1,8 @@
+2005-08-18 Matthew Sachs <[EMAIL PROTECTED]>
+
+ * Don't fall through to 10.2 for i386-apple-darwin8.FOO for
+ values of FOO which we don't know about.
+
2005-08-13 Daniel Macks <[EMAIL PROTECTED]>
* Validation.pm: Catch misuse of -Wl,-framework in .pc files.
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
