openjdk: disable and remove hack.

This commit is contained in:
Jérôme Duval
2018-11-01 19:35:32 +01:00
committed by GitHub
parent 45ffa2cd61
commit 7eb10f2bec

View File

@@ -48,7 +48,7 @@ ADDITIONAL_FILES="
"
ARCHITECTURES="!x86_gcc2 ?x86"
SECONDARY_ARCHITECTURES="x86"
SECONDARY_ARCHITECTURES="?x86"
DISABLE_SOURCE_PACKAGE=yes
# at least as long as Ant and a complete SDK image are part of the "sources" package
@@ -205,11 +205,6 @@ INSTALL()
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)