From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1713560-garchives=archives.gentoo.org@lists.gentoo.org> 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 finch.gentoo.org (Postfix) with ESMTPS id 2BD681580E0 for <garchives@archives.gentoo.org>; Wed, 29 Jan 2025 20:21:20 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 10F73342FEE for <garchives@archives.gentoo.org>; Wed, 29 Jan 2025 20:21:20 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 0B7191103B6; Wed, 29 Jan 2025 20:21:19 +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 bobolink.gentoo.org (Postfix) with ESMTPS id F2E811103B6 for <gentoo-commits@lists.gentoo.org>; Wed, 29 Jan 2025 20:21:18 +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 9BCD7342FB4 for <gentoo-commits@lists.gentoo.org>; Wed, 29 Jan 2025 20:21:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 06CCC1979 for <gentoo-commits@lists.gentoo.org>; Wed, 29 Jan 2025 20:21:17 +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: <1738182066.1bc5d3df1805f0f48a9262c053f88fc1d80ca0a6.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 X-VCS-Directories: 15.0.0/gentoo/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1bc5d3df1805f0f48a9262c053f88fc1d80ca0a6 X-VCS-Branch: master Date: Wed, 29 Jan 2025 20:21:17 +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: 3e0ae351-3504-4f7c-b04a-ddefc720ccb2 X-Archives-Hash: 13995ea559e44141f5e03ea167dbe848 commit: 1bc5d3df1805f0f48a9262c053f88fc1d80ca0a6 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Jan 29 20:21:06 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jan 29 20:21:06 2025 +0000 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=1bc5d3df 15.0.0: drop D parallel make patch Merged upstream. Signed-off-by: Sam James <sam <AT> gentoo.org> ...-d-give-dependency-files-better-filenames.patch | 54 ---------------------- 1 file changed, 54 deletions(-) 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 deleted file mode 100644 index 98156e4..0000000 --- a/15.0.0/gentoo/83_all-gcc-d-give-dependency-files-better-filenames.patch +++ /dev/null @@ -1,54 +0,0 @@ -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 -