From 6427eae7c3822f16e64f52035a6ecff25fa7c65a991ef55e48b6cf853b429026 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 24 Aug 2022 13:20:13 +0000
Subject: [PATCH] Accepting request 999035 from home:Andreas_Schwab:make

- make-jobserver-detection.patch: Fix detection of jobserver support

OBS-URL: https://build.opensuse.org/request/show/999035
OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=413
---
 java-1_8_0-openjdk.changes     |  5 +++++
 java-1_8_0-openjdk.spec        |  4 ++++
 make-jobserver-detection.patch | 13 +++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 make-jobserver-detection.patch

diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes
index d79d51b..ba49d18 100644
--- a/java-1_8_0-openjdk.changes
+++ b/java-1_8_0-openjdk.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Aug 24 10:48:55 UTC 2022 - Andreas Schwab <schwab@suse.de>
+
+- make-jobserver-detection.patch: Fix detection of jobserver support
+
 -------------------------------------------------------------------
 Tue Aug  2 19:37:31 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index bcc90a4..f3a0bab 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -180,6 +180,8 @@ Patch3:         java-atk-wrapper-security.patch
 Patch12:        adlc-parser.patch
 # Avoid triggering inactivity timeout while generating javadoc in zero VM
 Patch14:        zero-javadoc-verbose.patch
+# Fix detection of jobserver support
+Patch15:        make-jobserver-detection.patch
 #
 # OpenJDK specific patches
 #
@@ -516,6 +518,8 @@ patch -p0 -i %{PATCH12}
 patch -p0 -i %{PATCH14}
 %endif
 
+patch -p0 -i %{PATCH15}
+
 %ifarch ppc ppc64 ppc64le
 # PPC fixes
 patch -p0 -i %{PATCH103}
diff --git a/make-jobserver-detection.patch b/make-jobserver-detection.patch
new file mode 100644
index 0000000..9e7e0bd
--- /dev/null
+++ b/make-jobserver-detection.patch
@@ -0,0 +1,13 @@
+Index: openjdk/make/MakeHelpers.gmk
+===================================================================
+--- openjdk/make/MakeHelpers.gmk.orig
++++ 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"