public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openjdk/bootstrap: add zlib to bootstrap JDK RPATH

Browse Source 
./bin/java now apparently requires zlib.so, otherwise the whole
thing is busted. This is even required in the minimal configuration.

Unfortunately this impiles a rebuild of *all* OpenJDK packages and
their downstream dependencies.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2018-03-29 17:43:42 -05:00
parent 5f7cad19a8
commit bdb531f6af
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/openjdk/bootstrap.nix
View File

@ -1,5 +1,5 @@
{ stdenv { stdenv
, runCommand, fetchurl, file , runCommand, fetchurl, file, zlib
, version , version
}: }:
@ -45,7 +45,7 @@ let
find "$out" -type f -print0 | while IFS= read -r -d "" elf; do find "$out" -type f -print0 | while IFS= read -r -d "" elf; do
isELF "$elf" || continue isELF "$elf" || continue
patchelf --set-interpreter $(cat "${stdenv.cc}/nix-support/dynamic-linker") "$elf" || true patchelf --set-interpreter $(cat "${stdenv.cc}/nix-support/dynamic-linker") "$elf" || true
patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:$LIBDIRS" "$elf" || true patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:${zlib}/lib:$LIBDIRS" "$elf" || true
done 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: