diff options
Diffstat (limited to 'pkgs/development/compilers/openjdk/8.nix')
-rw-r--r-- | pkgs/development/compilers/openjdk/8.nix | 166 |
1 files changed, 88 insertions, 78 deletions
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 952c5d1bf6ae9..c93fc5a0926aa 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -1,9 +1,10 @@ { stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype -, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir +, alsaLib, cacert, perl, liberation_ttf, fontconfig, zlib , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr , libjpeg, giflib +, openjdk8-bootstrap , setJavaClassPath -, minimal ? false +, headless ? false , enableInfinality ? true # font rendering patch , enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf }: @@ -13,52 +14,71 @@ let /** * The JRE libraries are in directories that depend on the CPU. */ - architecture = - if stdenv.hostPlatform.system == "i686-linux" then - "i386" - else if stdenv.hostPlatform.system == "x86_64-linux" then - "amd64" - else - throw "openjdk requires i686-linux or x86_64 linux"; - - update = "212"; - build = "ga"; - baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u"; - repover = "jdk8u${update}-${build}"; + architecture = { + "i686-linux" = "i386"; + "x86_64-linux" = "amd64"; + "aarch64-linux" = "aarch64"; + }.${stdenv.system} or (throw "Unsupported platform"); + + update = "222"; + build = if stdenv.isAarch64 then "b10" + else "ga"; + baseurl = if stdenv.isAarch64 then "https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah" + else "https://hg.openjdk.java.net/jdk8u/jdk8u"; + repover = lib.optionalString stdenv.isAarch64 "aarch64-shenandoah-" + + "jdk8u${update}-${build}"; + jdk8 = fetchurl { + name = "jdk8-${repover}.tar.gz"; url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "00rl33h4cl4b4p3hcid765h38x2jdkb14ylh8k1zhnd0ka76crgg"; + sha256 = if stdenv.isAarch64 then "1h19zpmc76f8v4s0mfvqxmxvv8imdwq92z5dmgi19y4xnl978qq8" + else "19dyqayn8n2y08p08g34xxnf0dkm6bfjxkp7633m7dx50mjcpxnj"; }; langtools = fetchurl { + name = "langtools-${repover}.tar.gz"; url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "0va6g2dccf1ph6mpwxswbks5axp7zz258cl89qq9r8jn4ni04agw"; + sha256 = if stdenv.isAarch64 then "09phy2izw2yyp3hnw7jmb7lp559dgnp2a0rymx1k3q97anfz3bzj" + else "11nibmqnf7nap10sydk57gimgwpxqk5mn12dyg6fzg4s2fxf0y1q"; }; hotspot = fetchurl { + name = "hotspot-${repover}.tar.gz"; url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "0sgr9df10hs49pjld6c6kr374v4zwd9s52pc3drz68zrlk71ja4s"; + sha256 = if stdenv.isAarch64 then "1dqrzg2af94pjam6jg9nq8ydaibn4bsjv7ai6m7m3r2ph2fml80s" + else "1g512xrrxvnrk5szg7wqqz00x4gv53dx3yffk5im2zfcalyka2q7"; }; corba = fetchurl { + name = "corba-${repover}.tar.gz"; url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "1hq0sr4k4k4iv815kg72i9lvd7n7mn5pmw96ckk9p1rnyagn9z03"; + sha256 = if stdenv.isAarch64 then "15l1ccvk2slx8wf5gilzjvhc428hl57gg1knbma1jqgs3ymnqwpr" + else "0h8nprfzpy21mfl39fxxzfa420skwmaaji4r31j7lj3g8c1wp62r"; }; jdk = fetchurl { + name = "jdk-${repover}.tar.gz"; url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "1fc59jrbfq8l067mggzy5dnrvni7lwaqd7hahs4nqv87kyrfg545"; + sha256 = if stdenv.isAarch64 then "179ij3rs1ahl6dh3n64k4xp2prv413ckqk7sj1g5lw48rj7bjh83" + else "1sb38h0rckgkr2y0kfzav6mb74nv5whb9l8m842mv1jpavxrdv6k"; }; jaxws = fetchurl { + name = "jaxws-${repover}.tar.gz"; url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "1ka2fvyxdmpfhk814s314gx53yvdr19vpsqygx283v9nbq90l1yg"; + sha256 = if stdenv.isAarch64 then "16bayw7c4vzm9s0ixhw2dv6pan6wywyiddh9a8dss35660dnhrm0" + else "0akn5zapff5m32ibgm3f4lhgq96bsqx74g4xl38xmivvxddsd6kz"; }; jaxp = fetchurl { + name = "jaxp-${repover}.tar.gz"; url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "15vlgs5v2ax8sqwh7bg50fnlrwlpnkp0myzrvpqs1mcza8pyasp8"; + sha256 = if stdenv.isAarch64 then "176db7pi2irc7q87c273cjm5nrlj5g973fjmh24m6a1jxanrrm9x" + else "0bw4q8yhmrl8hqlimy1ijnarav4r91dj73lpr7axba77rqlr41c8"; }; nashorn = fetchurl { + name = "nashorn-${repover}.tar.gz"; url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "1jzn0yi0v6lda5y8ib07g1p6zymnbcx9yy6iz8niggpm7205y93h"; + sha256 = if stdenv.isAarch64 then "0vi3kbsqfpdjxc08ayxk2c87zycd7z0qbqw9xka1vc59iyv97n62" + else "0bfcf3iv2lr0xlp6sclxq7zz7b9ahajl008hz5rasjnrnr993qja"; }; openjdk8 = stdenv.mkDerivation { - name = "openjdk-8u${update}-${build}"; + pname = "openjdk" + lib.optionalString headless "-headless"; + version = "8u${update}-${build}"; srcs = [ jdk8 langtools hotspot corba jdk jaxws jaxp nashorn ]; sourceRoot = "."; @@ -67,15 +87,15 @@ let nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib + cpio file which unzip zip perl openjdk8-bootstrap zlib cups freetype alsaLib libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst - libXi libXinerama libXcursor libXrandr lndir fontconfig - ] ++ lib.optionals (!minimal && enableGnome2) [ + libXi libXinerama libXcursor libXrandr fontconfig + ] ++ lib.optionals (!headless && enableGnome2) [ gtk2 gnome_vfs GConf glib ]; - #move the seven other source dirs under the main jdk8u directory, - #with version suffixes removed, as the remainder of the build will expect + # move the seven other source dirs under the main jdk8u directory, + # with version suffixes removed, as the remainder of the build will expect prePatch = '' mainDir=$(find . -maxdepth 1 -name jdk8u\*); find . -maxdepth 1 -name \*jdk\* -not -name jdk8u\* | awk -F- '{print $1}' | while read p; do @@ -88,10 +108,10 @@ let ./fix-java-home-jdk8.patch ./read-truststore-from-env-jdk8.patch ./currency-date-range-jdk8.patch - ] ++ lib.optionals (!minimal && enableInfinality) [ + ] ++ lib.optionals (!headless && enableInfinality) [ ./004_add-fontconfig.patch ./005_enable-infinality.patch - ] ++ lib.optionals (!minimal && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGnome2) [ ./swing-use-gtk-jdk8.patch ]; @@ -103,33 +123,39 @@ let substituteInPlace configure --replace /bin/bash "${bash}/bin/bash" substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "${stdenv.shell}" substituteInPlace hotspot/make/linux/makefiles/dtrace.make --replace /usr/include/sys/sdt.h "/no-such-path" - '' - # https://bugzilla.redhat.com/show_bug.cgi?id=1306558 - # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 - + stdenv.lib.optionalString stdenv.cc.isGNU '' - NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error" ''; configureFlags = [ - "--with-boot-jdk=${bootjdk.home}" + "--with-boot-jdk=${openjdk8-bootstrap.home}" "--with-update-version=${update}" "--with-build-number=${build}" "--with-milestone=fcs" "--enable-unlimited-crypto" - "--disable-debug-symbols" + "--with-native-debug-symbols=internal" "--disable-freetype-bundling" "--with-zlib=system" "--with-giflib=system" "--with-stdc++lib=dynamic" + ] ++ lib.optional headless "--disable-headful"; + + separateDebugInfo = true; + NIX_CFLAGS_COMPILE = [ # glibc 2.24 deprecated readdir_r so we need this # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html - "--with-extra-cflags=\"-Wno-error=deprecated-declarations\"" - ] ++ lib.optional minimal "--disable-headful"; + "-Wno-error=deprecated-declarations" + ] ++ lib.optionals stdenv.cc.isGNU [ + # https://bugzilla.redhat.com/show_bug.cgi?id=1306558 + # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 + "-fno-lifetime-dse" + "-fno-delete-null-pointer-checks" + "-std=gnu++98" + "-Wno-error" + ]; - NIX_LDFLAGS= lib.optionals (!minimal) [ + NIX_LDFLAGS= lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!minimal && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGnome2) [ "-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" ]; @@ -138,45 +164,39 @@ let doCheck = false; # fails with "No rule to make target 'y'." installPhase = '' - mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk + mkdir -p $out/lib - cp -av build/*/images/j2sdk-image/* $out/lib/openjdk + mv build/*/images/j2sdk-image $out/lib/openjdk # Remove some broken manpages. rm -rf $out/lib/openjdk/man/ja* # Mirror some stuff in top-level. - mkdir $out/include $out/share/man - ln -s $out/lib/openjdk/include/* $out/include/ - ln -s $out/lib/openjdk/man/* $out/share/man/ + mkdir -p $out/share + ln -s $out/lib/openjdk/include $out/include + ln -s $out/lib/openjdk/man $out/share/man # jni.h expects jni_md.h to be in the header search path. ln -s $out/include/linux/*_md.h $out/include/ # Remove crap from the installation. rm -rf $out/lib/openjdk/demo $out/lib/openjdk/sample - ${lib.optionalString minimal '' + ${lib.optionalString headless '' rm $out/lib/openjdk/jre/lib/${architecture}/{libjsound,libjsoundalsa,libsplashscreen,libawt*,libfontmanager}.so rm $out/lib/openjdk/jre/bin/policytool rm $out/lib/openjdk/bin/{policytool,appletviewer} ''} - # Move the JRE to a separate output and setup fallback fonts - mv $out/lib/openjdk/jre $jre/lib/openjdk/ - mkdir $out/lib/openjdk/jre - ${lib.optionalString (!minimal) '' - mkdir -p $jre/lib/openjdk/jre/lib/fonts/fallback - lndir ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback - ''} - lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre + # Move the JRE to a separate output + mkdir -p $jre/lib/openjdk + mv $out/lib/openjdk/jre $jre/lib/openjdk/jre + ln -s $jre/lib/openjdk/jre $out/lib/openjdk/jre - rm -rf $out/lib/openjdk/jre/bina - ln -s $out/lib/openjdk/bin $out/lib/openjdk/jre/bin - - # Make sure cmm/*.pf are not symlinks: - # https://youtrack.jetbrains.com/issue/IDEA-147272 - rm -rf $out/lib/openjdk/jre/lib/cmm - ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm + # Setup fallback fonts + ${lib.optionalString (!headless) '' + mkdir -p $jre/lib/openjdk/jre/lib/fonts + ln -s ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback + ''} # Remove duplicate binaries. for i in $(cd $out/lib/openjdk/bin && echo *); do @@ -198,12 +218,7 @@ let ln -s $jre/lib/openjdk/jre $out/jre ''; - # FIXME: this is unnecessary once the multiple-outputs branch is merged. preFixup = '' - prefix=$jre stripDirs "$STRIP" "$stripDebugList" "''${stripDebugFlags:--S}" - patchELF $jre - propagatedBuildInputs+=" $jre" - # Propagate the setJavaClassPath setup hook from the JRE so that # any package that depends on the JRE has $CLASSPATH set up # properly. @@ -221,11 +236,12 @@ let # Build the set of output library directories to rpath against LIBDIRS="" for output in $outputs; do + if [ "$output" = debug ]; then continue; fi LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" done - # Add the local library paths to remove dependencies on the bootstrap for output in $outputs; do + if [ "$output" = debug ]; then continue; fi OUTPUTDIR=$(eval echo \$$output) BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) echo "$BINLIBS" | while read i; do @@ -233,22 +249,16 @@ let patchelf --shrink-rpath "$i" || true done done - - # Test to make sure that we don't depend on the bootstrap - for output in $outputs; do - if grep -q -r '${bootjdk}' $(eval echo \$$output); then - echo "Extraneous references to ${bootjdk} detected" - exit 1 - fi - done ''; - meta = with stdenv.lib; { + disallowedReferences = [ openjdk8-bootstrap ]; + + meta = with lib; { homepage = http://openjdk.java.net/; license = licenses.gpl2; description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo nequissimus ]; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; }; passthru = { |