dev-java/icedtea: fix build w/ make-4.4

Closes: https://bugs.gentoo.org/882611
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2024-03-04 07:39:57 +00:00
parent 67e62445b8
commit fe8b20a483
2 changed files with 15 additions and 0 deletions

View File

@@ -0,0 +1,13 @@
https://bugs.gentoo.org/882611
https://build.opensuse.org/package/view_file/openSUSE:Factory/java-1_8_0-openjdk/make-jobserver-detection.patch?expand=1
--- openjdk/make/MakeHelpers.gmk
+++ openjdk/make/MakeHelpers.gmk
@@ -145,7 +145,7 @@ endef
# Hook to be called as the very first thing when running a normal build
define AtMakeStart
- $(if $(findstring --jobserver,$(MAKEFLAGS)),$(error make -j is not supported, use make JOBS=n))
+ $(if $(findstring jobserver,$(.FEATURES)),,$(error make -j is not supported, use make JOBS=n))
$(call CheckEnvironment)
@$(PRINTF) $(LOG_INFO) "Running make as '$(MAKE) $(MFLAGS) $(MAKE_ARGS)'\n"
@$(PRINTF) "Building $(PRODUCT_NAME) for target '$(call GetRealTarget)' in configuration '$(CONF_NAME)'\n\n"

View File

@@ -203,7 +203,9 @@ src_configure() {
# ${FILESDIR} directly.
mkdir -v gentoo_patches || die
cp -v "${FILESDIR}/openjdk-8-hotspot-arrayallocator.patch" gentoo_patches || die
cp -v "${FILESDIR}/openjdk-8-make-4.4.patch" gentoo_patches || die
export DISTRIBUTION_PATCHES="gentoo_patches//openjdk-8-hotspot-arrayallocator.patch"
DISTRIBUTION_PATCHES+=" gentoo_patches//openjdk-8-make-4.4.patch"
# For bootstrap builds as the sandbox control file might not yet exist.
addpredict /proc/self/coredump_filter #nowarn