1*4882a593SmuzhiyunFrom f31eec323ae65124474664f8a0444f7c035556dd Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3*4882a593SmuzhiyunDate: Sun, 6 Sep 2020 22:31:12 +0200 4*4882a593SmuzhiyunSubject: [PATCH] olsrd: migrate to using bison 3.7.1 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunWith the upgrade to bison 3.7.1 (openwrt commit 1cf842d) building 7*4882a593Smuzhiyunolsrd was failing. Now, instead of the contents of header files 8*4882a593Smuzhiyunbeing directly inserted into the generated source files, they are 9*4882a593Smuzhiyuninstead included with a #include directive. 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunThe local.mk has, until now, done some magic with *-tmp files, 12*4882a593Smuzhiyunwhich is not longer necessary and even causes builds to fail. 13*4882a593Smuzhiyun 14*4882a593Smuzhiyunsrc/cfgparser/oparse.c:265:10: fatal error: oparse.h-tmp: No such file or directory 15*4882a593Smuzhiyun #include "oparse.h-tmp" 16*4882a593Smuzhiyun 17*4882a593SmuzhiyunSuggested-by: Jo-Philipp Wich <jo@mein.io> 18*4882a593SmuzhiyunSigned-off-by: Perry Melange <isprotejesvalkata@gmail.com> 19*4882a593Smuzhiyun[Retrieved from: 20*4882a593Smuzhiyunhttps://github.com/openwrt-routing/packages/commit/5cc8e058850acbc22fe92c5e2b24863efc577971] 21*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 22*4882a593Smuzhiyun[Upstream status: https://github.com/OLSR/olsrd/pull/87] 23*4882a593Smuzhiyun--- 24*4882a593Smuzhiyun src/cfgparser/local.mk | 8 ++------ 25*4882a593Smuzhiyun 1 file changed, 2 insertions(+), 6 deletions(-) 26*4882a593Smuzhiyun 27*4882a593Smuzhiyundiff --git a/src/cfgparser/local.mk b/src/cfgparser/local.mk 28*4882a593Smuzhiyunindex e767abfc..56e594e4 100644 29*4882a593Smuzhiyun--- a/src/cfgparser/local.mk 30*4882a593Smuzhiyun+++ b/src/cfgparser/local.mk 31*4882a593Smuzhiyun@@ -74,12 +74,8 @@ $(C)oparse.c: $(C)oparse.y $(C)olsrd_conf.h $(C)Makefile 32*4882a593Smuzhiyun ifeq ($(VERBOSE),0) 33*4882a593Smuzhiyun @echo "[BISON] $@" 34*4882a593Smuzhiyun endif 35*4882a593Smuzhiyun- $(MAKECMDPREFIX)$(BISON) -d -o "$@-tmp" "$<" 36*4882a593Smuzhiyun- $(MAKECMDPREFIX)sed -e 's/register //' \ 37*4882a593Smuzhiyun- -e '/^#line/s/$(call quote,$@-tmp)/$(call quote,$@)/' \ 38*4882a593Smuzhiyun- < "$@-tmp" >"$@" 39*4882a593Smuzhiyun- $(MAKECMDPREFIX)mv "$(subst .c,.h,$@-tmp)" "$(subst .c,.h,$@)" 40*4882a593Smuzhiyun- $(MAKECMDPREFIX)$(RM) "$@-tmp" "$(subst .c,.h,$@-tmp)" 41*4882a593Smuzhiyun+ $(MAKECMDPREFIX)$(BISON) -d -o "$@" "$<" 42*4882a593Smuzhiyun+ $(MAKECMDPREFIX)sed -e 's/register //' "$@" > "$@.o" && mv "$@.o" "$@" 43*4882a593Smuzhiyun 44*4882a593Smuzhiyun $(C)oparse.o: CFLAGS := $(filter-out -Wunreachable-code,$(CFLAGS)) 45*4882a593Smuzhiyun 46*4882a593Smuzhiyun-- 47*4882a593Smuzhiyun2.28.0 48*4882a593Smuzhiyun 49