[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#55751] [PATCH v2 7/7] gnu: openjdk15: Make reproducible.
From: |
Danny Milosavljevic |
Subject: |
[bug#55751] [PATCH v2 7/7] gnu: openjdk15: Make reproducible. |
Date: |
Mon, 31 Jul 2023 20:09:19 +0200 |
* gnu/packages/java.scm (openjdk15)[source]: Add patch.
---
gnu/packages/java.scm | 3 +-
.../openjdk-15-jtask-reproducibility.patch | 40 +++++++++++++++++++
2 files changed, 42 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/openjdk-15-jtask-reproducibility.patch
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index d4176f1375..a8aaedb8af 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1568,7 +1568,8 @@ (define-public openjdk15
(modules '())
(snippet #f)
(patches
- (search-patches "openjdk-15-xcursor-no-dynamic.patch"))))
+ (search-patches "openjdk-15-jtask-reproducibility.patch"
+ "openjdk-15-xcursor-no-dynamic.patch"))))
(inputs
(modify-inputs (package-inputs base)
(append libxcursor))) ;for our patch to work
diff --git a/gnu/packages/patches/openjdk-15-jtask-reproducibility.patch
b/gnu/packages/patches/openjdk-15-jtask-reproducibility.patch
new file mode 100644
index 0000000000..2052983ade
--- /dev/null
+++ b/gnu/packages/patches/openjdk-15-jtask-reproducibility.patch
@@ -0,0 +1,40 @@
+---
22kjr9lzrml0h5m55viq7zlfkqr9p7ny-openjdk-15.0.3-checkout/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java.orig
2022-04-04 10:57:40.346312924 +0200
++++
22kjr9lzrml0h5m55viq7zlfkqr9p7ny-openjdk-15.0.3-checkout/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java
2022-04-04 11:01:38.480751902 +0200
+@@ -82,6 +82,7 @@
+ import jdk.internal.module.ModuleTarget;
+ import jdk.internal.module.Resources;
+ import jdk.tools.jlink.internal.Utils;
++import java.util.TreeSet;
+
+ import static java.util.stream.Collectors.joining;
+
+@@ -750,6 +751,7 @@
+ void processSection(JmodOutputStream out, Section section, Path path)
+ throws IOException
+ {
++ TreeSet<Path> paths = new TreeSet<>();
+ Files.walkFileTree(path, Set.of(FileVisitOption.FOLLOW_LINKS),
+ Integer.MAX_VALUE, new SimpleFileVisitor<Path>() {
+ @Override
+@@ -765,14 +767,18 @@
+ if (out.contains(section, name)) {
+ warning("warn.ignore.duplicate.entry", name,
section);
+ } else {
+- try (InputStream in =
Files.newInputStream(file)) {
+- out.writeEntry(in, section, name);
+- }
++ paths.add(file);
+ }
+ }
+ return FileVisitResult.CONTINUE;
+ }
+ });
++
++ for (Path file : paths) {
++ try (InputStream in = Files.newInputStream(file)) {
++ out.writeEntry(in, section,
path.relativize(file).toString());
++ }
++ }
+ }
+
+ boolean matches(Path path, List<PathMatcher> matchers) {
--
2.39.2
- [bug#55751] [PATCH v2 0/7] Towards reproducible openjdk, Danny Milosavljevic, 2023/07/31
- [bug#55751] [PATCH v2 1/7] gnu: openjdk9: Make build reproducible., Danny Milosavljevic, 2023/07/31
- [bug#55751] [PATCH v2 7/7] gnu: openjdk15: Make reproducible.,
Danny Milosavljevic <=
- [bug#55751] [PATCH v2 3/7] gnu: openjdk11: Make more reproducible., Danny Milosavljevic, 2023/07/31
- [bug#55751] [PATCH v2 4/7] gnu: openjdk12: Make reproducible., Danny Milosavljevic, 2023/07/31
- [bug#55751] [PATCH v2 6/7] gnu: openjdk14: Make reproducible., Danny Milosavljevic, 2023/07/31
- [bug#55751] [PATCH v2 2/7] gnu: openjdk10: Make more reproducible., Danny Milosavljevic, 2023/07/31
- [bug#55751] [PATCH v2 5/7] gnu: openjdk13: Make reproducible., Danny Milosavljevic, 2023/07/31