packages: icedtea6/icedtea6.spec - set JAVA_HOME and PATH... otherwise it w...

jajcus jajcus at pld-linux.org
Fri Apr 16 15:52:55 CEST 2010


Author: jajcus                       Date: Fri Apr 16 13:52:55 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- set JAVA_HOME and PATH... otherwise it works, but configure seems to take random javac from /usr/bin then, which may be unreliable

---- Files affected:
packages/icedtea6:
   icedtea6.spec (1.38 -> 1.39) 

---- Diffs:

================================================================
Index: packages/icedtea6/icedtea6.spec
diff -u packages/icedtea6/icedtea6.spec:1.38 packages/icedtea6/icedtea6.spec:1.39
--- packages/icedtea6/icedtea6.spec:1.38	Fri Apr 16 15:41:04 2010
+++ packages/icedtea6/icedtea6.spec	Fri Apr 16 15:52:49 2010
@@ -357,7 +357,12 @@
 ln -s %{SOURCE4} drops
 
 %build
-unset JAVA_HOME || :
+%if %{with bootstrap}
+export JAVA_HOME=%{_gcj_home}
+%else
+export JAVA_HOME=%{_jvmdir}/icedtea6
+%endif
+export PATH="$JAVA_HOME/bin:$PATH"
 
 %{__aclocal}
 %{__autoconf}
@@ -808,6 +813,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.39  2010/04/16 13:52:49  jajcus
+- set JAVA_HOME and PATH... otherwise it works, but configure seems to take random javac from /usr/bin then, which may be unreliable
+
 Revision 1.38  2010/04/16 13:41:04  jajcus
 - _noautoreq
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedtea6/icedtea6.spec?r1=1.38&r2=1.39&f=u



More information about the pld-cvs-commit mailing list