ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: openjdk15: Make reproducible.

Browse source 
* gnu/packages/java.scm (openjdk15)[source]: Add patch.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This commit is contained in:
Danny Milosavljevic 2023-07-31 20:09:19 +02:00 committed by Ludovic Courtès
parent dbce2fc287
commit 3c8ca6b26b
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 42 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gnu/packages/java.scm
View file

@ -1710,7 +1710,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

40
gnu/packages/patches/openjdk-15-jtask-reproducibility.patch Normal file
View file

@ -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) {