about summary refs log tree commit diff
path: root/pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin-jdk17.patch
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin-jdk17.patch')
-rw-r--r--pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin-jdk17.patch21
1 files changed, 0 insertions, 21 deletions
diff --git a/pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin-jdk17.patch b/pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin-jdk17.patch
deleted file mode 100644
index 3bb610ee35c0..000000000000
--- a/pkgs/development/compilers/openjdk/ignore-LegalNoticeFilePlugin-jdk17.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/LegalNoticeFilePlugin.java
-+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/LegalNoticeFilePlugin.java
-@@ -112,18 +112,6 @@
-             .filter(e -> Arrays.equals(e.contentBytes(), entry.contentBytes()))
-             .findFirst();
-         if (!otarget.isPresent()) {
--            if (errorIfNotSameContent) {
--                // all legal notices of the same file name are expected
--                // to contain the same content
--                Optional<ResourcePoolEntry> ores =
--                    entries.stream().filter(e -> e.linkedTarget() == null)
--                           .findAny();
--
--                if (ores.isPresent()) {
--                    throw new PluginException(ores.get().path() + " " +
--                        entry.path() + " contain different content");
--                }
--            }
-             entries.add(entry);
-         } else {
-             entries.add(ResourcePoolEntry.createSymLink(entry.path(),