Based on: http://git.yoctoproject.org/cgit/cgit.cgi/poky/plain/meta/recipes-connectivity/ppp/ppp/0001-ppp-Fix-compilation-errors-in-Makefile.patch?h=thud-next --------------------------------------------------------------- From ba0f6058d1f25b2b60fc31ab2656bf12a71ffdab Mon Sep 17 00:00:00 2001 From: Lu Chong Date: Tue, 5 Nov 2013 17:32:56 +0800 Subject: [PATCH] ppp: Fix compilation errors in Makefile Make can't exit while compilation error occurs in subdir for plugins building. Upstream-Status: Pending Signed-off-by: Lu Chong ----------------------------------------------------------------- Build doesn't exit, even build failed with some error. Example: from plugin.c:29: /home/timesys/factory/build_armv7l-timesys-linux-gnueabihf/toolchain/include/sys/socket.h:90:264: note: originally defined here In file included from /home/timesys/factory/build_armv7l-timesys-linux-gnueabihf/toolchain/include/linux/if_pppol2tp.h:20:0, from /home/timesys/factory/build_armv7l-timesys-linux-gnueabihf/toolchain/include/linux/if_pppox.h:26, from plugin.c:52: /home/timesys/factory/build_armv7l-timesys-linux-gnueabihf/toolchain/include/linux/in6.h:32:8: error: redefinition of 'struct in6_addr' struct in6_addr { ^ In file included from pppoe.h:87:0, from plugin.c:29: /home/timesys/factory/build_armv7l-timesys-linux-gnueabihf/toolchain/include/netinet/in.h:209:8: note: originally defined here struct in6_addr ^ In file included from /home/timesys/factory/build_armv7l-timesys-linux-gnueabihf/toolchain/include/linux/if_pppol2tp.h:20:0, from /home/timesys/factory/build_armv7l-timesys-linux-gnueabihf/toolchain/include/linux/if_pppox.h:26, from plugin.c:52: /home/timesys/factory/build_armv7l-timesys-linux-gnueabihf/toolchain/include/linux/in6.h:49:8: error: redefinition of 'struct sockaddr_in6' struct sockaddr_in6 { ^ In file included from pppoe.h:47:0, from plugin.c:29: --- pppd/plugins/Makefile.linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux index ab8cf50..ae64149 100644 --- a/pppd/plugins/Makefile.linux +++ b/pppd/plugins/Makefile.linux @@ -27,7 +27,7 @@ include .depend endif all: $(PLUGINS) - for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all; done + for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all || exit 1; done %.so: %.c $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ -- 2.17.1