From d13102c03e56218efe1567122305f3bff89c0672 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 22 Sep 2022 07:48:00 +0930 Subject: [PATCH] bfd BLD-POTFILES.in dependencies A file that consists of a list of files doesn't depend on those files being built. This patch came from trying to avoid a maintainer-mode make -j bug, where the recipe for targmatch.h was being run twice in parallel. Typical output shown below. make[2]: Entering directory '/build/gas/all/bfd' GEN bfdver.h GEN elf32-target.h GEN elf64-target.h GEN targmatch.h Making info in po make[3]: Entering directory '/build/gas/all/bfd/po' cd .. && make po/SRC-POTFILES.in cd .. && make po/BLD-POTFILES.in make[4]: Entering directory '/build/gas/all/bfd' GEN elf32-aarch64.c GEN elf64-aarch64.c GEN elf32-ia64.c GEN elf64-ia64.c GEN elf32-loongarch.c GEN elf64-loongarch.c GEN elf32-riscv.c GEN elf64-riscv.c GEN peigen.c GEN pepigen.c GEN pex64igen.c GEN pe-aarch64igen.c GEN targmatch.h make[4]: Entering directory '/build/gas/all/bfd' CCLD doc/chew.stamp mv: cannot stat 'targmatch.new': No such file or directory make[4]: *** [Makefile:2325: targmatch.h] Error 1 * Makefile.am (po/BLD-POTFILES.in): Don't depend on $(BLD_POTFILES). (po/SRC-POTFILES.in): Don't depend on $(SRC_POTFILES). --- bfd/Makefile.am | 4 ++-- bfd/Makefile.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 04fb335d47d..c23dff6cac3 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -735,12 +735,12 @@ $(BFD32_LIBS) \ SRC_POTFILES = $(SOURCE_CFILES) $(SOURCE_HFILES) BLD_POTFILES = $(BUILD_CFILES) $(BUILD_HFILES) -po/SRC-POTFILES.in: @MAINT@ Makefile $(SRC_POTFILES) +po/SRC-POTFILES.in: @MAINT@ Makefile for file in $(SRC_POTFILES); do echo $$file; done \ | LC_ALL=C sort > tmp.src \ && mv tmp.src $(srcdir)/po/SRC-POTFILES.in -po/BLD-POTFILES.in: @MAINT@ Makefile $(BLD_POTFILES) +po/BLD-POTFILES.in: @MAINT@ Makefile for file in $(BLD_POTFILES); do echo $$file; done \ | LC_ALL=C sort > tmp.bld \ && mv tmp.bld $(srcdir)/po/BLD-POTFILES.in diff --git a/bfd/Makefile.in b/bfd/Makefile.in index e05b0c9d156..82843d2d61d 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -2285,12 +2285,12 @@ $(BFD32_LIBS) \ $(BFD64_BACKENDS) \ $(OPTIONAL_BACKENDS): $(BFD_H) $(BFD_H_DEPS) $(LOCAL_H_DEPS) -po/SRC-POTFILES.in: @MAINT@ Makefile $(SRC_POTFILES) +po/SRC-POTFILES.in: @MAINT@ Makefile for file in $(SRC_POTFILES); do echo $$file; done \ | LC_ALL=C sort > tmp.src \ && mv tmp.src $(srcdir)/po/SRC-POTFILES.in -po/BLD-POTFILES.in: @MAINT@ Makefile $(BLD_POTFILES) +po/BLD-POTFILES.in: @MAINT@ Makefile for file in $(BLD_POTFILES); do echo $$file; done \ | LC_ALL=C sort > tmp.bld \ && mv tmp.bld $(srcdir)/po/BLD-POTFILES.in -- 2.30.2