diff options
| author | Danny Milosavljevic <dannym@scratchpost.org> | 2023-07-31 20:09:17 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-31 10:44:39 +0200 |
| commit | 5996fb5b0c7ce7ca6b1552308199effa66cbcf6a (patch) | |
| tree | 969661019abcac62096353f3994dbf72b1306e35 /gnu | |
| parent | d109a7322c0597b4f265df93061886984fca9037 (diff) | |
| download | guix-5996fb5b0c7ce7ca6b1552308199effa66cbcf6a.tar guix-5996fb5b0c7ce7ca6b1552308199effa66cbcf6a.tar.gz | |
gnu: openjdk13: Make reproducible.
* gnu/packages/patches/openjdk-13-classlist-reproducibility.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add patch.
* gnu/packages/java.scm (openjdk13)[source]: Add patch.
[arguments]<#:phases>[remove-timestamping]: Modify phase.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I1b2943c989e2d6acfd8131ea4ede978c61948811
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/java.scm | 17 | ||||
| -rw-r--r-- | gnu/packages/patches/openjdk-13-classlist-reproducibility.patch | 11 |
3 files changed, 26 insertions, 3 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 591c415ea2..39322b43de 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1841,6 +1841,7 @@ dist_patch_DATA = \ %D%/packages/patches/openjdk-10-pointer-comparison.patch \ %D%/packages/patches/openjdk-10-setsignalhandler.patch \ %D%/packages/patches/openjdk-11-classlist-reproducibility.patch \ + %D%/packages/patches/openjdk-13-classlist-reproducibility.patch \ %D%/packages/patches/openjdk-15-xcursor-no-dynamic.patch \ %D%/packages/patches/openjdk-21-fix-rpath.patch \ %D%/packages/patches/openmpi-mtl-priorities.patch \ diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 257483b9e3..b2a1181d54 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1669,9 +1669,20 @@ blacklisted.certs.pem" (define-public openjdk13 (make-openjdk openjdk12 "13.0.14" "1v92i5rhahqkjw8mz09c9qasnxqc67ygy0y266kdmm534z0da755" - (source (origin - (inherit (package-source base)) - (patches '()))))) + (source (origin + (inherit (package-source base)) + (patches (search-patches "openjdk-13-classlist-reproducibility.patch" + "openjdk-10-jtask-reproducibility.patch")))) + (arguments + (substitute-keyword-arguments (package-arguments openjdk12) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'remove-timestamping + (lambda _ + (substitute* + "src/hotspot/share/runtime/abstract_vm_version.cpp" + (("__DATE__") "") + (("__TIME__") "")))))))))) (define-public openjdk14 (make-openjdk diff --git a/gnu/packages/patches/openjdk-13-classlist-reproducibility.patch b/gnu/packages/patches/openjdk-13-classlist-reproducibility.patch new file mode 100644 index 0000000000..326f6875ec --- /dev/null +++ b/gnu/packages/patches/openjdk-13-classlist-reproducibility.patch @@ -0,0 +1,11 @@ +--- 6cllxkf0narh0b4wgx8npwjkznd7ifq0-openjdk-13.0.7-checkout/make/GenerateLinkOptData.gmk.orig 2022-04-04 17:20:33.012539984 +0200 ++++ 6cllxkf0narh0b4wgx8npwjkznd7ifq0-openjdk-13.0.7-checkout/make/GenerateLinkOptData.gmk 2022-04-04 17:20:51.181032859 +0200 +@@ -78,7 +78,7 @@ + $(CAT) $(LINK_OPT_DIR)/stderr $(JLI_TRACE_FILE) ; \ + exit $$exitcode \ + ) +- $(GREP) -v HelloClasslist $@.raw > $@ ++ $(GREP) -v HelloClasslist $@.raw | sort > $@ + + # The jli trace is created by the same recipe as classlist. By declaring these + # dependencies, make will correctly rebuild both jli trace and classlist |