Commit a397dd2e authored by Dmitry Blinov's avatar Dmitry Blinov Committed by Esteban Blanc

add rpaths to binary java-jdk

separate java-jdk to an own component
add patchelf
patchelf java-jdk's binaries

this is needed for linking tests to pass
parent d05fe062
...@@ -7,7 +7,6 @@ extends = ...@@ -7,7 +7,6 @@ extends =
parts = parts =
java-jdk java-jdk
[java-jdk] [java-jdk]
recipe = plone.recipe.command recipe = plone.recipe.command
command = echo "Error: unsupported platform" && false command = echo "Error: unsupported platform" && false
......
...@@ -9,6 +9,7 @@ parts = ...@@ -9,6 +9,7 @@ parts =
[patchelf] [patchelf]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
<<<<<<< HEAD
shared = true shared = true
url = https://github.com/NixOS/patchelf/archive/0.11.tar.gz url = https://github.com/NixOS/patchelf/archive/0.11.tar.gz
md5sum = 6cffb77ee7a95bd314d954a6aeb53a02 md5sum = 6cffb77ee7a95bd314d954a6aeb53a02
......
...@@ -7,6 +7,7 @@ extends = ...@@ -7,6 +7,7 @@ extends =
../../component/gtk-2/buildout.cfg ../../component/gtk-2/buildout.cfg
../../component/alsa/buildout.cfg ../../component/alsa/buildout.cfg
../../component/java/buildout.cfg ../../component/java/buildout.cfg
../../component/java-jdk/buildout.cfg
../../component/qt/buildout.cfg ../../component/qt/buildout.cfg
../../component/gcc/buildout.cfg ../../component/gcc/buildout.cfg
../../component/git/buildout.cfg ../../component/git/buildout.cfg
...@@ -29,11 +30,11 @@ extends = ...@@ -29,11 +30,11 @@ extends =
parts = parts =
pwr pwr
[java-jdk] #[java-jdk]
recipe = hexagonit.recipe.download #recipe = hexagonit.recipe.download
url = https://download.java.net/java/GA/jdk12.0.2/e482c34c86bd4bf8b56c0b35558996b9/10/GPL/openjdk-12.0.2_linux-x64_bin.tar.gz #url = https://download.java.net/java/GA/jdk12.0.2/e482c34c86bd4bf8b56c0b35558996b9/10/GPL/openjdk-12.0.2_linux-x64_bin.tar.gz
md5sum = f5da6f4dec81bdd2a096184ec1d69216 #md5sum = f5da6f4dec81bdd2a096184ec1d69216
strip-top-level-dir = true #strip-top-level-dir = true
[doxygen] [doxygen]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment