From 2e12a1437f510dadcb6f9088ec9936260bb23e16 Mon Sep 17 00:00:00 2001
From: Christian Neukirchen <chneukirchen@gmail.com>
Date: Tue, 2 Sep 2014 01:53:43 +0200
Subject: [PATCH] openjdk: bootstrap using openjdk, add profile.d helper

---
 srcpkgs/openjdk/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openjdk/template b/srcpkgs/openjdk/template
index 167e29be34..d1939ca89a 100644
--- a/srcpkgs/openjdk/template
+++ b/srcpkgs/openjdk/template
@@ -11,7 +11,7 @@ _jdk_build=23
 version=${_java_ver}u${_jdk_update}
 _repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
 _openjdk_version=openjdk-1.8.0_$(printf '%.2d' ${_jdk_update})
-revision=4
+revision=5
 wrksrc=jdk8u-jdk8u${_jdk_update}-b${_jdk_build}/
 build_style=gnu-configure
 configure_args="
@@ -59,7 +59,6 @@ disable_parallel_build=yes
 
 build_options="oracle_bootstrap"
 desc_option_oracle_bootstrap="Bootstrap using Oracle JDK"
-build_options_default="oracle_bootstrap"
 
 post_extract() {
 	chmod +x configure
@@ -87,6 +86,11 @@ openjdk-jre_package() {
         pkg_install() {
 		vmove "usr/lib/jvm/$_openjdk_version/jre"
 		ln -s $_openjdk_version ${PKGDESTDIR}/usr/lib/jvm/openjdk
+		vmkdir etc/profile.d
+		cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk.sh <<EOF
+export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/$_openjdk_version/jre}
+export PATH="\$PATH:/usr/lib/jvm/$_openjdk_version/jre/bin:/usr/lib/jvm/$_openjdk_version/bin"
+EOF
         }
 }