summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2023-06-11 23:27:20 +0100
committerSam James <sam@gentoo.org>2023-06-11 23:27:20 +0100
commitbc4187c370e1695f55189d6e966493e159c1c194 (patch)
tree9c1773da99c577df68721d62dfe6976945f3c633
parentmedia-sound/mpd: Stabilize 0.23.12-r2 amd64, #907380 (diff)
downloadgentoo-bc4187c370e1695f55189d6e966493e159c1c194.tar.gz
gentoo-bc4187c370e1695f55189d6e966493e159c1c194.tar.bz2
gentoo-bc4187c370e1695f55189d6e966493e159c1c194.zip
dev-java/openjdk: sanitize MAKEFLAGS as well
Followup to e6189599e065597600a4d5ddb1f2905205bd01c7. Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--dev-java/openjdk/openjdk-11.0.18_p10.ebuild2
-rw-r--r--dev-java/openjdk/openjdk-17.0.6_p10-r1.ebuild2
-rw-r--r--dev-java/openjdk/openjdk-17.0.6_p10.ebuild2
-rw-r--r--dev-java/openjdk/openjdk-8.362_p09.ebuild2
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)