From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6744B158041 for ; Mon, 4 Mar 2024 07:40:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4BCCFE2AE6; Mon, 4 Mar 2024 07:40:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2F8F1E2AE6 for ; Mon, 4 Mar 2024 07:40:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2239F340441 for ; Mon, 4 Mar 2024 07:40:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5117410B0 for ; Mon, 4 Mar 2024 07:40:39 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1709538003.fe8b20a48349bbd32c170e1e15fb573ab7909680.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea/files/, dev-java/icedtea/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/icedtea/files/openjdk-8-make-4.4.patch dev-java/icedtea/icedtea-3.21.0.ebuild X-VCS-Directories: dev-java/icedtea/files/ dev-java/icedtea/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: fe8b20a48349bbd32c170e1e15fb573ab7909680 X-VCS-Branch: master Date: Mon, 4 Mar 2024 07:40:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 194869bb-6c83-4552-979e-96ad453a3724 X-Archives-Hash: 83bcabb6dedd934e54a178ff82f91086 commit: fe8b20a48349bbd32c170e1e15fb573ab7909680 Author: Sam James gentoo org> AuthorDate: Mon Mar 4 07:39:57 2024 +0000 Commit: Sam James gentoo org> CommitDate: Mon Mar 4 07:40:03 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe8b20a4 dev-java/icedtea: fix build w/ make-4.4 Closes: https://bugs.gentoo.org/882611 Signed-off-by: Sam James gentoo.org> dev-java/icedtea/files/openjdk-8-make-4.4.patch | 13 +++++++++++++ dev-java/icedtea/icedtea-3.21.0.ebuild | 2 ++ 2 files changed, 15 insertions(+) diff --git a/dev-java/icedtea/files/openjdk-8-make-4.4.patch b/dev-java/icedtea/files/openjdk-8-make-4.4.patch new file mode 100644 index 000000000000..1217895b7547 --- /dev/null +++ b/dev-java/icedtea/files/openjdk-8-make-4.4.patch @@ -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" diff --git a/dev-java/icedtea/icedtea-3.21.0.ebuild b/dev-java/icedtea/icedtea-3.21.0.ebuild index 2cfc8e518512..c4fd8dd748b4 100644 --- a/dev-java/icedtea/icedtea-3.21.0.ebuild +++ b/dev-java/icedtea/icedtea-3.21.0.ebuild @@ -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