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

[Sam James]

commit:     bc4187c370e1695f55189d6e966493e159c1c194
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 11 22:27:20 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 11 22:27:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc4187c3

dev-java/openjdk: sanitize MAKEFLAGS as well

Followup to e6189599e065597600a4d5ddb1f2905205bd01c7.

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

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

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

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 dcc0a6301e0d..4bd169b2c1c3 100644
--- a/dev-java/openjdk/openjdk-17.0.6_p10-r1.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.6_p10-r1.ebuild
@@ -261,8 +261,8 @@ src_configure() {
 
 src_compile() {
        # Too brittle - gets confused by e.g. -Oline
-       unset GNUMAKEFLAGS
        export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
+       unset GNUMAKEFLAGS MAKEFLAGS
 
        local myemakeargs=(
                JOBS=$(makeopts_jobs)

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

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