From 7eb10f2becd41c04605a822073b7b568b9fd3ca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Thu, 1 Nov 2018 19:35:32 +0100 Subject: [PATCH] openjdk: disable and remove hack. --- dev-lang/openjdk/openjdk-1.8.u40_b27.recipe | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dev-lang/openjdk/openjdk-1.8.u40_b27.recipe b/dev-lang/openjdk/openjdk-1.8.u40_b27.recipe index 7cf3cdd4e..4c257666d 100644 --- a/dev-lang/openjdk/openjdk-1.8.u40_b27.recipe +++ b/dev-lang/openjdk/openjdk-1.8.u40_b27.recipe @@ -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)