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-ar...@aarsen.me/ - -From 327b1b3834b4e3c80b209a35a73b063a0f9bfd75 Mon Sep 17 00:00:00 2001 -Message-ID: <327b1b3834b4e3c80b209a35a73b063a0f9bfd75.1736738577.git....@gentoo.org> -From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <ar...@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 -
