Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From ba0f6058d1f25b2b60fc31ab2656bf12a71ffdab Mon Sep 17 00:00:00 2001 |
| 2 | From: Lu Chong <Chong.Lu@windriver.com> |
| 3 | Date: Tue, 5 Nov 2013 17:32:56 +0800 |
| 4 | Subject: [PATCH] ppp: Fix compilation errors in Makefile |
| 5 | |
| 6 | This patch fixes below issues: |
| 7 | |
| 8 | 1. Make can't exit while compilation error occurs in subdir for plugins building. |
| 9 | |
| 10 | 2. If build ppp with newer kernel (3.10.10), it will pick 'if_pppox.h' from sysroot-dir and |
| 11 | 'if_pppol2tp.h' from its own source dir, this cause below build errors: |
| 12 | |
| 13 | bitbake_build/tmp/sysroots/intel-x86-64/usr/include/linux/if_pppox.h:84:26: |
| 14 | error: field 'pppol2tp' has incomplete type |
| 15 | struct pppol2tpin6_addr pppol2tp; |
| 16 | ^ |
| 17 | bitbake_build/tmp/sysroots/intel-x86-64/usr/include/linux/if_pppox.h:99:28: |
| 18 | error: field 'pppol2tp' has incomplete type |
| 19 | struct pppol2tpv3in6_addr pppol2tp; |
| 20 | ^ |
| 21 | |
| 22 | The 'sysroot-dir/if_pppox.h' enabled ipv6 support but the 'source-dir/if_pppol2tp.h' lost |
| 23 | related structure definitions, we should use both header files from sysroots to fix this |
| 24 | build failure. |
| 25 | |
| 26 | Upstream-Status: Pending |
| 27 | |
| 28 | Signed-off-by: Lu Chong <Chong.Lu@windriver.com> |
| 29 | --- |
| 30 | pppd/plugins/Makefile.linux | 2 +- |
| 31 | pppd/plugins/pppol2tp/Makefile.linux | 2 +- |
| 32 | pppd/plugins/rp-pppoe/Makefile.linux | 2 +- |
| 33 | 3 files changed, 3 insertions(+), 3 deletions(-) |
| 34 | |
| 35 | diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux |
| 36 | index 0a7ec7b..2a2c15a 100644 |
| 37 | --- a/pppd/plugins/Makefile.linux |
| 38 | +++ b/pppd/plugins/Makefile.linux |
| 39 | @@ -20,7 +20,7 @@ include .depend |
| 40 | endif |
| 41 | |
| 42 | all: $(PLUGINS) |
| 43 | - for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all; done |
| 44 | + for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all || exit 1; done |
| 45 | |
| 46 | %.so: %.c |
| 47 | $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ |
| 48 | diff --git a/pppd/plugins/pppol2tp/Makefile.linux b/pppd/plugins/pppol2tp/Makefile.linux |
| 49 | index 19eff67..feb2f52 100644 |
| 50 | --- a/pppd/plugins/pppol2tp/Makefile.linux |
| 51 | +++ b/pppd/plugins/pppol2tp/Makefile.linux |
| 52 | @@ -1,6 +1,6 @@ |
| 53 | #CC = gcc |
| 54 | COPTS = -O2 -g |
| 55 | -CFLAGS = $(COPTS) -I. -I../.. -I../../../include -fPIC |
| 56 | +CFLAGS = $(COPTS) -I. -I../.. -fPIC |
| 57 | LDFLAGS = -shared |
| 58 | INSTALL = install |
| 59 | |
| 60 | diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux |
| 61 | index f078991..15b9118 100644 |
| 62 | --- a/pppd/plugins/rp-pppoe/Makefile.linux |
| 63 | +++ b/pppd/plugins/rp-pppoe/Makefile.linux |
| 64 | @@ -26,7 +26,7 @@ INSTALL = install |
| 65 | RP_VERSION=3.8p |
| 66 | |
| 67 | COPTS=-O2 -g |
| 68 | -CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"' |
| 69 | +CFLAGS=$(COPTS) '-DRP_VERSION="$(RP_VERSION)"' |
| 70 | all: rp-pppoe.so pppoe-discovery |
| 71 | |
| 72 | pppoe-discovery: pppoe-discovery.o debug.o |
| 73 | -- |
| 74 | 1.7.9.5 |
| 75 | |