Update of /cvsroot/fink/fink
In directory vz-cvs-3.sog:/tmp/cvs-serv1826
Modified Files:
ChangeLog bootstrap
Log Message:
require JavaSDK be intalled before bootstrapping on 10.7
Index: bootstrap
===================================================================
RCS file: /cvsroot/fink/fink/bootstrap,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- bootstrap 19 Jun 2011 23:11:53 -0000 1.50
+++ bootstrap 7 Jul 2011 19:41:19 -0000 1.51
@@ -138,6 +138,13 @@
} elsif ($vers >= 11) {
# 10.7 we support only 64-bit
$arch = "x86_64";
+ # check that Java SDK is installed (otherwise Lion
autoinstalls it on-demand)
+ if (-x '/usr/bin/javac') {
+ my $need_java_sdk = `/usr/bin/javac -version
2>&1>/dev/null`;
+ if ($need_java_sdk =~ m/No Java runtime
present\, requesting install\./) {
+ die "Please install Java SDK before
re-attempting fink bootstrap\n";
+ }
+ }
} else {
# 10.[56] can do either 32- or 64-bit: user choice
my $arch_intro= "Your hardware is a 64bit-compatible
intel " .
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/ChangeLog,v
retrieving revision 1.542
retrieving revision 1.543
diff -u -d -r1.542 -r1.543
--- ChangeLog 19 Jun 2011 23:11:53 -0000 1.542
+++ ChangeLog 7 Jul 2011 19:41:19 -0000 1.543
@@ -1,3 +1,7 @@
+2011-07-11 Daniel Macks <[email protected]>
+
+ * bootstrap: require pre-installation of java on 10.7
+
2011-06-11 Daniel Macks <[email protected]>
* bootstrap: wrong kernel version in previous commit
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
