From a0d5b7905b4b3ffb2405b7f3b017a2b8da11e689 Mon Sep 17 00:00:00 2001
From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
Date: Tue, 10 Nov 2020 11:03:19 -0500
Subject: dev-java/{,openj9-}openjdk: rm A workaround, unused patch

---
 .../openjdk/files/openjdk-src-doubledollar.patch   | 28 ++++++++++++++++++++++
 dev-java/openjdk/openjdk-15.0.1_p9.ebuild          |  6 ++---
 2 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 dev-java/openjdk/files/openjdk-src-doubledollar.patch

(limited to 'dev-java/openjdk')

diff --git a/dev-java/openjdk/files/openjdk-src-doubledollar.patch b/dev-java/openjdk/files/openjdk-src-doubledollar.patch
new file mode 100644
index 0000000..c1497d5
--- /dev/null
+++ b/dev-java/openjdk/files/openjdk-src-doubledollar.patch
@@ -0,0 +1,28 @@
+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.1_p9.ebuild
index 5b855a5..16e914f 100644
--- a/dev-java/openjdk/openjdk-15.0.1_p9.ebuild
+++ b/dev-java/openjdk/openjdk-15.0.1_p9.ebuild
@@ -101,6 +101,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	eapply "${FILESDIR}/openjdk-src-doubledollar.patch"
 	default
 	chmod +x configure || die
 }
@@ -173,10 +174,7 @@ src_compile() {
 		$(usex doc docs '')
 		$(usex jbootstrap bootcycle-images product-images)
 	)
-	(
-		unset A
-		emake "${myemakeargs[@]}" -j1 #nowarn
-	)
+	emake "${myemakeargs[@]}" -j1 #nowarn
 }
 
 src_install() {
-- 
cgit v1.2.3-70-g09d2