forked from mirrors/nixpkgs
openjdk-bootstrap: Don't depend on the length of the Glibc version
Building the bootstrap OpenJDK failed if the Glibc version string is not 4 characters, e.g. "2.12.1" would cause a corrupt tarball.
This commit is contained in:
parent
ec6b82a0c2
commit
365ce3ddba
|
@ -16,9 +16,13 @@ let
|
||||||
in
|
in
|
||||||
|
|
||||||
runCommand "openjdk-bootstrap" {} ''
|
runCommand "openjdk-bootstrap" {} ''
|
||||||
xz -dc ${src} | sed "s/e*-glibc-[^/]*/$(basename ${glibc})/g" | tar xv
|
tar xvf ${src}
|
||||||
mv openjdk-bootstrap $out
|
mv openjdk-bootstrap $out
|
||||||
|
|
||||||
|
for i in $out/bin/*; do
|
||||||
|
patchelf --set-interpreter ${glibc}/lib/ld-linux*.so.2 $i
|
||||||
|
done
|
||||||
|
|
||||||
# Temporarily, while NixOS's OpenJDK bootstrap tarball doesn't have PaX markings:
|
# Temporarily, while NixOS's OpenJDK bootstrap tarball doesn't have PaX markings:
|
||||||
exes=$(${file}/bin/file $out/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
|
exes=$(${file}/bin/file $out/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
|
||||||
for file in $exes; do
|
for file in $exes; do
|
||||||
|
|
Loading…
Reference in a new issue