summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Xu (Hello71) <alex_y_xu@yahoo.ca>2020-10-25 18:57:05 -0400
committerAlex Xu (Hello71) <alex_y_xu@yahoo.ca>2020-10-25 18:57:37 -0400
commita8b250c518f5efc89e4c2c85b289201ee1bea9e8 (patch)
treeae12a6b5eda815d8f54587afc00617ccdf465caa
parenta14240e133a60c2a0b2dadcd5a6d7b27c0580f3c (diff)
downloadgentoo-overlay-a8b250c518f5efc89e4c2c85b289201ee1bea9e8.tar.xz
gentoo-overlay-a8b250c518f5efc89e4c2c85b289201ee1bea9e8.zip
dev-java/openj9-openjdk: fixes
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-11.0.23.0.ebuild5
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild2
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-15.0.23.0.ebuild5
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-15.9999.ebuild5
4 files changed, 9 insertions, 8 deletions
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.23.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.23.0.ebuild
index b58f4d3..73e6a3e 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.23.0.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.23.0.ebuild
@@ -186,7 +186,6 @@ src_prepare() {
default
- eapply -d openj9 -- "${FILESDIR}/openj9-make-jvmti-test-variables-static.patch"
eapply -d omr -- "${FILESDIR}/omr-omrstr-iconv-failure-overflow.patch"
eapply -d omr -- "${FILESDIR}/omr-fam.patch"
@@ -204,10 +203,6 @@ src_configure() {
# Work around stack alignment issue, bug #647954. in case we ever have x86
use x86 && append-flags -mincoming-stack-boundary=2
- # https://bugs.openjdk.java.net/browse/JDK-8249792
- # backported to 11.0.9
- append-flags -fcommon
-
if has_version dev-java/freemarker; then
local freemarker=freemarker
else
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild
index 73e6a3e..388a762 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild
@@ -26,7 +26,7 @@ else
fi
LICENSE="GPL-2"
-KEYWORDS="~amd64"
+KEYWORDS=""
IUSE="alsa cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap large-heap +pch selinux source systemtap"
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-15.0.23.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-15.0.23.0.ebuild
index 350e2f3..efa65fd 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-15.0.23.0.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-15.0.23.0.ebuild
@@ -233,7 +233,10 @@ src_compile() {
$(usex doc docs '')
$(usex jbootstrap bootcycle-images product-images)
)
- emake "${myemakeargs[@]}" -j1 #nowarn
+ (
+ unset A
+ emake "${myemakeargs[@]}" -j1 #nowarn
+ )
}
src_install() {
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-15.9999.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-15.9999.ebuild
index a89a950..01fc9d6 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-15.9999.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-15.9999.ebuild
@@ -233,7 +233,10 @@ src_compile() {
$(usex doc docs '')
$(usex jbootstrap bootcycle-images product-images)
)
- emake "${myemakeargs[@]}" -j1 #nowarn
+ (
+ unset A
+ emake "${myemakeargs[@]}" -j1 #nowarn
+ )
}
src_install() {