pool/dtc
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1006015 from home:Andreas_Schwab:Factory

Browse Source 
- makefile-bison-rule.patch: Makefile: fix infinite recursion by dropping
  non-existent `%.output`

OBS-URL: https://build.opensuse.org/request/show/1006015
OBS-URL: https://build.opensuse.org/package/show/Base:System/dtc?expand=0&rev=59
This commit is contained in:
Dirk Mueller 2022-09-27 11:25:54 +00:00 committed by Git OBS Bridge
parent ad20c76635
commit 404d7421d2
3 changed files with 58 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dtc.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Sep 26 07:37:52 UTC 2022 - Andreas Schwab <schwab@suse.de>
- makefile-bison-rule.patch: Makefile: fix infinite recursion by dropping
non-existent `%.output`
-------------------------------------------------------------------
Sat Oct 16 13:06:58 UTC 2021 - Dirk Müller <dmueller@suse.com>

2
dtc.spec
View File

@ -27,6 +27,7 @@ Source0: https://mirrors.edge.kernel.org/pub/software/utils/dtc/dtc-%{ver
Source1: https://mirrors.edge.kernel.org/pub/software/utils/dtc/dtc-%{version}.tar.sign
Source20: baselibs.conf
Source21: dtc.keyring
Patch0: makefile-bison-rule.patch
BuildRequires: bison
BuildRequires: flex
BuildRequires: libyaml-devel
@ -59,6 +60,7 @@ This package provides development files for libfdt
%prep
%setup -q
%patch0 -p1
%build
%make_build EXTRA_CFLAGS="%{optflags} -pie" LDFLAGS="%{optflags}"

50
makefile-bison-rule.patch Normal file
View File

@ -0,0 +1,50 @@
From 98a07006c48dc0bc3f42b3b3ce75b7f03e87e724 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 25 Sep 2022 11:42:03 +0100
Subject: [PATCH] Makefile: fix infinite recursion by dropping non-existent
`%.output`
Without the change GNU `make-4.4` falls into infinite recursion of trying
to generate %.output files (bison is not passed flags to generate debug
output).
This happens on GNU `make-4.4` only after GNU make change to more eagerly
rebuild all target outputs in multiple targets:
https://savannah.gnu.org/bugs/index.php?63098
The recursion here is the following:
- Makefile depends on *.d files
- *.d files depend on *.c files
- *.c files are generated by bison
- bison is triggered whenever some of it's multiple targets are missing
In our case `%.output` is always missing and bison is always reran.
*.d files are always regenerated on `make` run. And make is always
restarted as *.d files are always regenerated.
The fix removes infeasible `%.output`.
Signed-off-by: Sergei Trofimovich <slyich@gmail.com>
Message-Id: <20220925104203.648449-2-slyich@gmail.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index e7a0dcb..d4e7551 100644
--- a/Makefile
+++ b/Makefile
@@ -384,7 +384,7 @@ clean: libfdt_clean pylibfdt_clean tests_clean
@$(VECHO) LEX $@
$(LEX) -o$@ $<
-%.tab.c %.tab.h %.output: %.y
+%.tab.c %.tab.h: %.y
@$(VECHO) BISON $@
$(BISON) -b $(basename $(basename $@)) -d $<
--
2.37.3