summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2023-06-11 22:10:05 +0100
committerSam James <sam@gentoo.org>2023-06-11 22:10:05 +0100
commite6189599e065597600a4d5ddb1f2905205bd01c7 (patch)
tree3ffe9625d4e464b3c0a8f3bbcc2694bf05ad67e3 /dev-java
parentapp-editors/nano: revbump for highlighting fix (diff)
downloadgentoo-e6189599e065597600a4d5ddb1f2905205bd01c7.tar.gz
gentoo-e6189599e065597600a4d5ddb1f2905205bd01c7.tar.bz2
gentoo-e6189599e065597600a4d5ddb1f2905205bd01c7.zip
dev-java/openjdk: sanitize MAKEOPTS
Confused by -Oline. Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/openjdk/openjdk-11.0.18_p10.ebuild4
-rw-r--r--dev-java/openjdk/openjdk-17.0.6_p10-r1.ebuild4
-rw-r--r--dev-java/openjdk/openjdk-17.0.6_p10.ebuild4
-rw-r--r--dev-java/openjdk/openjdk-8.362_p09.ebuild4
4 files changed, 16 insertions, 0 deletions
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