[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/

[Sam James]

commit:     e6189599e065597600a4d5ddb1f2905205bd01c7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 11 21:10:05 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 11 21:10:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6189599

dev-java/openjdk: sanitize MAKEOPTS

Confused by -Oline.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/openjdk/openjdk-11.0.18_p10.ebuild   | 4 ++++
 dev-java/openjdk/openjdk-17.0.6_p10-r1.ebuild | 4 ++++
 dev-java/openjdk/openjdk-17.0.6_p10.ebuild    | 4 ++++
 dev-java/openjdk/openjdk-8.362_p09.ebuild     | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/dev-java/openjdk/openjdk-11.0.18_p10.ebuild 
b/dev-java/openjdk/openjdk-11.0.18_p10.ebuild
index 8f67061d2ac5..f3b187b7fef1 100644
--- a/dev-java/openjdk/openjdk-11.0.18_p10.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.18_p10.ebuild
@@ -243,6 +243,10 @@ src_configure() {
 }
 
 src_compile() {
+       # Too brittle - gets confused by e.g. -Oline
+       unset GNUMAKEFLAGS
+       export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
+
        local myemakeargs=(
                JOBS=$(makeopts_jobs)
                LOG=debug

diff --git a/dev-java/openjdk/openjdk-17.0.6_p10-r1.ebuild 
b/dev-java/openjdk/openjdk-17.0.6_p10-r1.ebuild
index 1a2fcdf2672e..dcc0a6301e0d 100644
--- a/dev-java/openjdk/openjdk-17.0.6_p10-r1.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.6_p10-r1.ebuild
@@ -260,6 +260,10 @@ src_configure() {
 }
 
 src_compile() {
+       # Too brittle - gets confused by e.g. -Oline
+       unset GNUMAKEFLAGS
+       export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
+
        local myemakeargs=(
                JOBS=$(makeopts_jobs)
                LOG=debug

diff --git a/dev-java/openjdk/openjdk-17.0.6_p10.ebuild 
b/dev-java/openjdk/openjdk-17.0.6_p10.ebuild
index 328018b6e7c8..7218bafd6657 100644
--- a/dev-java/openjdk/openjdk-17.0.6_p10.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.6_p10.ebuild
@@ -258,6 +258,10 @@ src_configure() {
 }
 
 src_compile() {
+       # Too brittle - gets confused by e.g. -Oline
+       unset GNUMAKEFLAGS
+       export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
+
        local myemakeargs=(
                JOBS=$(makeopts_jobs)
                LOG=debug

diff --git a/dev-java/openjdk/openjdk-8.362_p09.ebuild 
b/dev-java/openjdk/openjdk-8.362_p09.ebuild
index 2da4bca4fce1..86ca94ebf8cd 100644
--- a/dev-java/openjdk/openjdk-8.362_p09.ebuild
+++ b/dev-java/openjdk/openjdk-8.362_p09.ebuild
@@ -178,6 +178,10 @@ src_configure() {
 }
 
 src_compile() {
+       # Too brittle - gets confused by e.g. -Oline
+       unset GNUMAKEFLAGS
+       export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
+
        local myemakeargs=(
                JOBS=$(makeopts_jobs)
                LOG=debug