| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748 |
- From f31eec323ae65124474664f8a0444f7c035556dd Mon Sep 17 00:00:00 2001
- From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
- Date: Sun, 6 Sep 2020 22:31:12 +0200
- Subject: [PATCH] olsrd: migrate to using bison 3.7.1
- With the upgrade to bison 3.7.1 (openwrt commit 1cf842d) building
- olsrd was failing. Now, instead of the contents of header files
- being directly inserted into the generated source files, they are
- instead included with a #include directive.
- The local.mk has, until now, done some magic with *-tmp files,
- which is not longer necessary and even causes builds to fail.
- src/cfgparser/oparse.c:265:10: fatal error: oparse.h-tmp: No such file or directory
- #include "oparse.h-tmp"
- Suggested-by: Jo-Philipp Wich <jo@mein.io>
- Signed-off-by: Perry Melange <isprotejesvalkata@gmail.com>
- [Retrieved from:
- https://github.com/openwrt-routing/packages/commit/5cc8e058850acbc22fe92c5e2b24863efc577971]
- Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
- [Upstream status: https://github.com/OLSR/olsrd/pull/87]
- ---
- src/cfgparser/local.mk | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
- diff --git a/src/cfgparser/local.mk b/src/cfgparser/local.mk
- index e767abfc..56e594e4 100644
- --- a/src/cfgparser/local.mk
- +++ b/src/cfgparser/local.mk
- @@ -74,12 +74,8 @@ $(C)oparse.c: $(C)oparse.y $(C)olsrd_conf.h $(C)Makefile
- ifeq ($(VERBOSE),0)
- @echo "[BISON] $@"
- endif
- - $(MAKECMDPREFIX)$(BISON) -d -o "$@-tmp" "$<"
- - $(MAKECMDPREFIX)sed -e 's/register //' \
- - -e '/^#line/s/$(call quote,$@-tmp)/$(call quote,$@)/' \
- - < "$@-tmp" >"$@"
- - $(MAKECMDPREFIX)mv "$(subst .c,.h,$@-tmp)" "$(subst .c,.h,$@)"
- - $(MAKECMDPREFIX)$(RM) "$@-tmp" "$(subst .c,.h,$@-tmp)"
- + $(MAKECMDPREFIX)$(BISON) -d -o "$@" "$<"
- + $(MAKECMDPREFIX)sed -e 's/register //' "$@" > "$@.o" && mv "$@.o" "$@"
-
- $(C)oparse.o: CFLAGS := $(filter-out -Wunreachable-code,$(CFLAGS))
-
- --
- 2.28.0
|
