openjdk: symlink to /bin before adding the lib symlink.

This commit is contained in:
Jerome Duval
2018-11-01 11:23:05 +01:00
parent c58668bc81
commit 8adae0ef41

View File

@@ -10,7 +10,7 @@ license. OpenJDK is the official Java SE 8 reference implementation."
HOMEPAGE="https://openjdk.java.net/"
COPYRIGHT="2015 Oracle and/or its affiliates."
LICENSE="GNU GPL v2"
REVISION="4"
REVISION="5"
SOURCE_URI="https://bitbucket.org/hamishm/haiku-jdk8u/get/6e3a7c2446ea.zip"
CHECKSUM_SHA256="68cb8171d84b1a0c12e20b2ecc968a12ed8f64d39858a6e3af9e287877c2245e"
SOURCE_DIR="hamishm-haiku-jdk8u-6e3a7c2446ea"
@@ -200,16 +200,16 @@ INSTALL()
# set up the cacerts link
ln -sf $dataDir/ssl/java/cacerts $jdkDir/jre/lib/security/
# workaround: libstdc++.so.6 and its dependencies needed to load libjvm.so
mkdir -p $jdkDir/bin/lib
ln -sf $libDir/libstdc++.so.6 $libDir/libgcc_s.so.1 $libDir/libroot.so \
$jdkDir/bin/lib/
# symlink the executables to binDir
mkdir -p $prefix/bin
symlinkRelative -s $jdkDir/bin/* $prefix/bin
# TODO: We should probably link only a subset.
# workaround: libstdc++.so.6 and its dependencies needed to load libjvm.so
mkdir -p $jdkDir/bin/lib
ln -sf $libDir/libstdc++.so.6 $libDir/libgcc_s.so.1 $libDir/libroot.so \
$jdkDir/bin/lib/
# create a profile.d file that sets up JAVA_HOME
jdkProfile=$dataDir/profile.d/openjdk.sh
mkdir -p $(dirname $jdkProfile)