5cc8e05885
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>
16 lines
660 B
Diff
16 lines
660 B
Diff
--- 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))
|