summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Xu (Hello71) <alex_y_xu@yahoo.ca>2021-08-07 10:25:35 -0400
committerAlex Xu (Hello71) <alex_y_xu@yahoo.ca>2021-08-07 10:25:35 -0400
commitc038c5241283e7a55b0d881296be60119284e684 (patch)
treeb435131d1957c9c9825872c47b41af468c16a606
parentf3364bb8babee2a92bba05370e2fc0adcc822f95 (diff)
downloadgentoo-overlay-c038c5241283e7a55b0d881296be60119284e684.tar.xz
gentoo-overlay-c038c5241283e7a55b0d881296be60119284e684.zip
dev-java/openj9-openjdk: no force o3
-rw-r--r--dev-java/openj9-openjdk/files/openj9-no-o3.patch11
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-11.0.27.0.ebuild1
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild1
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-16.0.27.0.ebuild1
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-16.9999.ebuild1
5 files changed, 15 insertions, 0 deletions
diff --git a/dev-java/openj9-openjdk/files/openj9-no-o3.patch b/dev-java/openj9-openjdk/files/openj9-no-o3.patch
new file mode 100644
index 0000000..63d1dcf
--- /dev/null
+++ b/dev-java/openj9-openjdk/files/openj9-no-o3.patch
@@ -0,0 +1,11 @@
+diff -ru a/runtime/cmake/platform/toolcfg/gnu.cmake b/runtime/cmake/platform/toolcfg/gnu.cmake
+--- a/runtime/cmake/platform/toolcfg/gnu.cmake 2021-07-20 17:24:52.000000000 -0400
++++ b/runtime/cmake/platform/toolcfg/gnu.cmake 2021-08-07 09:46:15.685325927 -0400
+@@ -20,7 +20,6 @@
+ # SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
+ ################################################################################
+
+-list(APPEND OMR_PLATFORM_COMPILE_OPTIONS -O3 -g -fstack-protector)
+ list(APPEND OMR_PLATFORM_C_COMPILE_OPTIONS -Wimplicit -Wreturn-type)
+ list(APPEND OMR_PLATFORM_CXX_COMPILE_OPTIONS -fno-threadsafe-statics)
+
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.27.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.27.0.ebuild
index f504ef4..b51e7de 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.27.0.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.27.0.ebuild
@@ -183,6 +183,7 @@ src_prepare() {
default
+ eapply -d openj9 -- "${FILESDIR}/openj9-no-o3.patch"
eapply -d omr -- "${FILESDIR}/omr-omrstr-iconv-failure-overflow.patch"
eapply -d omr -- "${FILESDIR}/omr-fam.patch"
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild
index fe6e12c..d9d533d 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild
@@ -183,6 +183,7 @@ src_prepare() {
default
+ eapply -d openj9 -- "${FILESDIR}/openj9-no-o3.patch"
eapply -d omr -- "${FILESDIR}/omr-omrstr-iconv-failure-overflow.patch"
eapply -d omr -- "${FILESDIR}/omr-fam.patch"
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-16.0.27.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-16.0.27.0.ebuild
index d3cd752..917362f 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-16.0.27.0.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-16.0.27.0.ebuild
@@ -141,6 +141,7 @@ src_prepare() {
default
+ eapply -d openj9 -- "${FILESDIR}/openj9-no-o3.patch"
eapply -d omr -- "${FILESDIR}/omr-omrstr-iconv-failure-overflow.patch"
eapply -d omr -- "${FILESDIR}/omr-fam.patch"
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-16.9999.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-16.9999.ebuild
index c0cf1d1..576a338 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-16.9999.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-16.9999.ebuild
@@ -141,6 +141,7 @@ src_prepare() {
default
+ eapply -d openj9 -- "${FILESDIR}/openj9-no-o3.patch"
eapply -d omr -- "${FILESDIR}/omr-omrstr-iconv-failure-overflow.patch"
eapply -d omr -- "${FILESDIR}/omr-fam.patch"