diff options
| author | Alex Xu (Hello71) <alex_y_xu@yahoo.ca> | 2021-01-25 07:33:05 -0500 |
|---|---|---|
| committer | Alex Xu (Hello71) <alex_y_xu@yahoo.ca> | 2021-01-25 07:33:05 -0500 |
| commit | afb9284f1b14866d911748d0932347763cbf11de (patch) | |
| tree | 74d69f671d3f086c3cfe24e4ef382263f5be5cb9 /dev-java/openjdk | |
| parent | 6f7b32be2cb9a245861040905e1546f20dd0e993 (diff) | |
| download | gentoo-overlay-afb9284f1b14866d911748d0932347763cbf11de.tar.xz gentoo-overlay-afb9284f1b14866d911748d0932347763cbf11de.zip | |
dev-java/*: bump, fixes
Diffstat (limited to 'dev-java/openjdk')
| -rw-r--r-- | dev-java/openjdk/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/openjdk/files/openjdk-src-doubledollar.patch | 28 | ||||
| -rw-r--r-- | dev-java/openjdk/openjdk-15.0.2_p7.ebuild (renamed from dev-java/openjdk/openjdk-15.0.1_p9.ebuild) | 1 |
3 files changed, 1 insertions, 30 deletions
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest index 0028d21..e2fe888 100644 --- a/dev-java/openjdk/Manifest +++ b/dev-java/openjdk/Manifest @@ -1 +1 @@ -DIST openjdk-15.0.1_p9.tar.bz2 77426210 BLAKE2B 4334d43cdd51c7899c9746a728cf6855c1c05cb78c0543d966c6b1150b67540aac504777f4756d4abf05a1b229bdb2bb36ca17b8ca14f9d2c81be023775bf472 SHA512 41b947cc0be1635e2de330c5289ed436f79bf23221f1a00350f8f80f5b4c27610658930e86bcdc35dd8a6babd860ad8d5792e414340e82e4f44da148b22b4b40 +DIST openjdk-15.0.2_p7.tar.bz2 77419602 BLAKE2B 43d7a286e38677b3b53a76b7306bc0881795ea65ef40c7513adbd3f96a095e6196c3a4d3bee77a4047acd427e6490d2150b8f2570850ec5c80a670dcb411f34a SHA512 65692c8018247e6589325836213dc5a09df8b3d8fb91a67b1c3e3ccd1a34c7235f0b3af557ead840fdd0fb998f0558fce32ee5a26598115cae6601ad5e60eb7e diff --git a/dev-java/openjdk/files/openjdk-src-doubledollar.patch b/dev-java/openjdk/files/openjdk-src-doubledollar.patch deleted file mode 100644 index c1497d5..0000000 --- a/dev-java/openjdk/files/openjdk-src-doubledollar.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0601ac847afc86e9010685bb85d82a00a33355b5 Mon Sep 17 00:00:00 2001 -From: erikj <erik.joelsson@oracle.com> -Date: Mon, 2 Nov 2020 06:18:08 -0800 -Subject: [PATCH] Add DoubleDollar call to protect java class file names with - dollar in them - ---- - make/common/JavaCompilation.gmk | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/make/common/JavaCompilation.gmk b/make/common/JavaCompilation.gmk -index 444ded0fc06..bedb971115b 100644 ---- a/make/common/JavaCompilation.gmk -+++ b/make/common/JavaCompilation.gmk -@@ -311,9 +311,11 @@ define SetupJavaCompilationBody - ifneq ($$($1_KEEP_DUPS), true) - # Remove duplicate source files by keeping the first found of each duplicate. - # This allows for automatic overrides with custom or platform specific versions -- # source files. -+ # source files. Need to call DoubleDollar as we have java classes with '$' in -+ # their names. - $1_SRCS := $$(strip $$(foreach s, $$($1_SRCS), \ -- $$(eval relative_src := $$(call remove-prefixes, $$($1_SRC), $$(s))) \ -+ $$(eval relative_src := $$(call remove-prefixes, $$($1_SRC), \ -+ $$(call DoubleDollar, $$(s)))) \ - $$(if $$($1_$$(relative_src)), \ - , \ - $$(eval $1_$$(relative_src) := 1) $$(s)))) diff --git a/dev-java/openjdk/openjdk-15.0.1_p9.ebuild b/dev-java/openjdk/openjdk-15.0.2_p7.ebuild index 16e914f..d41bc00 100644 --- a/dev-java/openjdk/openjdk-15.0.1_p9.ebuild +++ b/dev-java/openjdk/openjdk-15.0.2_p7.ebuild @@ -101,7 +101,6 @@ pkg_setup() { } src_prepare() { - eapply "${FILESDIR}/openjdk-src-doubledollar.patch" default chmod +x configure || die } |