mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 05:48:07 -05:00
2f1daa3574
* gnu/packages/patches/openjdk-9-classlist-reproducibility.patch: New file. * gnu/packages/patches/openjdk-9-jar-reproducibility.patch: New file. * gnu/packages/patches/openjdk-9-module-reproducibility.patch: New file. * gnu/packages/patches/openjdk-9-module2-reproducibility.patch: New file. * gnu/packages/patches/openjdk-9-module3-reproducibility.patch: New file. * gnu/packages/patches/openjdk-9-idlj-reproducibility.patch: New file. * gnu/packages/java.scm (openjdk9)[source]: Add patches. [arguments]<#:phases>[strip-zip-timestamps]: Modify. [native-inputs, inputs]: Use new-style syntax. * gnu/local/mk (dist_patch_DATA): Add patches. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Change-Id: Ifb7a87b0c11f3a7032597013ac904aefc9234db1
36 lines
1.6 KiB
Diff
36 lines
1.6 KiB
Diff
From: Danny Milosavljevic <dannym@scratchpost.org>
|
|
Date: Wed, 18 Apr 2022 21:50:00 +0100
|
|
Subject: Make module descriptor reproducible
|
|
|
|
--- orig/jdk-3cc80be736f2/jdk/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java 1970-01-01 01:00:01.000000000 +0100
|
|
+++ jdk-3cc80be736f2/jdk/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java 2022-04-13 17:30:37.242775977 +0200
|
|
@@ -43,6 +43,7 @@
|
|
import java.util.Objects;
|
|
import java.util.Optional;
|
|
import java.util.Set;
|
|
+import java.util.TreeSet;
|
|
import java.util.function.Supplier;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Stream;
|
|
@@ -2155,9 +2156,9 @@
|
|
* @return The module descriptor
|
|
*/
|
|
public ModuleDescriptor build() {
|
|
- Set<Requires> requires = new HashSet<>(this.requires.values());
|
|
- Set<Exports> exports = new HashSet<>(this.exports.values());
|
|
- Set<Opens> opens = new HashSet<>(this.opens.values());
|
|
+ Set<Requires> requires = new TreeSet<>(this.requires.values());
|
|
+ Set<Exports> exports = new TreeSet<>(this.exports.values());
|
|
+ Set<Opens> opens = new TreeSet<>(this.opens.values());
|
|
|
|
// add dependency on java.base
|
|
if (strict
|
|
@@ -2169,7 +2170,7 @@
|
|
null));
|
|
}
|
|
|
|
- Set<Provides> provides = new HashSet<>(this.provides.values());
|
|
+ Set<Provides> provides = new TreeSet<>(this.provides.values());
|
|
|
|
return new ModuleDescriptor(name,
|
|
version,
|