From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1708954-garchives=archives.gentoo.org@lists.gentoo.org> 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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1C88A15813A for <garchives@archives.gentoo.org>; Mon, 13 Jan 2025 03:23:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B6F8E07FE; Mon, 13 Jan 2025 03:23:50 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0E980E07FE for <gentoo-commits@lists.gentoo.org>; Mon, 13 Jan 2025 03:23:49 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4B733340943 for <gentoo-commits@lists.gentoo.org>; Mon, 13 Jan 2025 03:23:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B0EDF1D2A for <gentoo-commits@lists.gentoo.org>; Mon, 13 Jan 2025 03:23:46 +0000 (UTC) From: "Sam James" <sam@gentoo.org> 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" <sam@gentoo.org> Message-ID: <1736738618.9034a6d5fcf3a2ead9735466c906830d472a2f9c.sam@gentoo> Subject: [gentoo-commits] proj/gcc-patches:master commit in: 15.0.0/gentoo/ X-VCS-Repository: proj/gcc-patches X-VCS-Files: 15.0.0/gentoo/83_all-gcc-d-give-dependency-files-better-filenames.patch 15.0.0/gentoo/README.history X-VCS-Directories: 15.0.0/gentoo/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 9034a6d5fcf3a2ead9735466c906830d472a2f9c X-VCS-Branch: master Date: Mon, 13 Jan 2025 03:23:46 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7b004e1a-88fd-446e-9ead-90b35914fe93 X-Archives-Hash: 6c82f4a6e694f344435f396400d5e86a commit: 9034a6d5fcf3a2ead9735466c906830d472a2f9c Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Jan 13 03:23:31 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jan 13 03:23:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=9034a6d5 15.0.0: add parallel build patch for D Thank you Arsen! Signed-off-by: Sam James <sam <AT> gentoo.org> ...-d-give-dependency-files-better-filenames.patch | 54 ++++++++++++++++++++++ 15.0.0/gentoo/README.history | 1 + 2 files changed, 55 insertions(+) diff --git a/15.0.0/gentoo/83_all-gcc-d-give-dependency-files-better-filenames.patch b/15.0.0/gentoo/83_all-gcc-d-give-dependency-files-better-filenames.patch new file mode 100644 index 0000000..98156e4 --- /dev/null +++ b/15.0.0/gentoo/83_all-gcc-d-give-dependency-files-better-filenames.patch @@ -0,0 +1,54 @@ +https://inbox.sourceware.org/gcc-patches/20250112153348.1578402-1-arsen@aarsen.me/ + +From 327b1b3834b4e3c80b209a35a73b063a0f9bfd75 Mon Sep 17 00:00:00 2001 +Message-ID: <327b1b3834b4e3c80b209a35a73b063a0f9bfd75.1736738577.git.sam@gentoo.org> +From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me> +Date: Sun, 12 Jan 2025 16:16:58 +0100 +Subject: [PATCH] gcc/d: give dependency files better filenames + +Currently, the dependency files for root-file.o and common-file.o were +both d/.deps/file.Po, which would cause parallel builds to fail +sometimes with: + + make[3]: Leaving directory '/var/tmp/portage/sys-devel/gcc-14.1.1_p20240511/work/build/gcc' + make[3]: Entering directory '/var/tmp/portage/sys-devel/gcc-14.1.1_p20240511/work/build/gcc' + mv: cannot stat 'd/.deps/file.TPo': No such file or directory + make[3]: *** [/var/tmp/portage/sys-devel/gcc-14.1.1_p20240511/work/gcc-14-20240511/gcc/d/Make-lang.in:421: d/root-file.o] Error 1 shuffle=131581365 + +Also, this means that dependencies of one of root-file or common-file +are missing when developing. After this patch, those two files get +assigned dependency files d/.deps/d-root-file.o.Po and +d/.deps/d-common-file.o.Po respectively. + +There are other files with similar conflicts (mangle-package.o, +visitor-package.o for instance). + +gcc/d/ChangeLog: + +* Make-lang.in: Assign dependency-tracking files better + filenames. +--- + gcc/d/Make-lang.in | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/gcc/d/Make-lang.in b/gcc/d/Make-lang.in +index f28761e4b370..25e2b0bbfe94 100644 +--- a/gcc/d/Make-lang.in ++++ b/gcc/d/Make-lang.in +@@ -65,8 +65,9 @@ ALL_DFLAGS = $(DFLAGS-$@) $(GDCFLAGS) -fversion=IN_GCC $(CHECKING_DFLAGS) \ + $(WARN_DFLAGS) + + DCOMPILE.base = $(GDC) -c $(ALL_DFLAGS) -o $@ +-DCOMPILE = $(DCOMPILE.base) -MT $@ -MMD -MP -MF $(@D)/$(DEPDIR)/$(*F).TPo +-DPOSTCOMPILE = @mv $(@D)/$(DEPDIR)/$(*F).TPo $(@D)/$(DEPDIR)/$(*F).Po ++DEPFILE = $(subst /,-,$@) ++DCOMPILE = $(DCOMPILE.base) -MT $@ -MMD -MP -MF $(@D)/$(DEPDIR)/$(DEPFILE).TPo ++DPOSTCOMPILE = @mv $(@D)/$(DEPDIR)/$(DEPFILE).TPo $(@D)/$(DEPDIR)/$(DEPFILE).Po + DLINKER = $(GDC) $(NO_PIE_FLAG) -lstdc++ + + # Like LINKER, but use a mutex for serializing front end links. + +base-commit: 0e05b793fba2a9bea9f0fbb1f068679f5dadf514 +-- +2.48.0 + diff --git a/15.0.0/gentoo/README.history b/15.0.0/gentoo/README.history index 1f53f35..58edd02 100644 --- a/15.0.0/gentoo/README.history +++ b/15.0.0/gentoo/README.history @@ -1,6 +1,7 @@ 38 ???? + 82_all_PR118409-ifcombine.patch + + 83_all-gcc-d-give-dependency-files-better-filenames.patch 37 13 January 2025