From 3a5ab77e8e29c9e2929185acb13e7fdae53dea18 Mon Sep 17 00:00:00 2001 From: Lu Chong Date: Tue, 5 Nov 2013 18:39:26 +0800 Subject: ppp: Fix compilation errors in Makefile This patch fixes below issues: 1. Make can't exit while compilation error occurs in subdir for plugins building. 2. If build ppp with newer kernel (3.10.10), it will pick 'if_pppox.h' from sysroot-dir and 'if_pppol2tp.h' from its own source dir, this cause below build errors: bitbake_build/tmp/sysroots/intel-x86-64/usr/include/linux/if_pppox.h:84:26: error: field 'pppol2tp' has incomplete type struct pppol2tpin6_addr pppol2tp; ^ bitbake_build/tmp/sysroots/intel-x86-64/usr/include/linux/if_pppox.h:99:28: error: field 'pppol2tp' has incomplete type struct pppol2tpv3in6_addr pppol2tp; ^ The 'sysroot-dir/if_pppox.h' enabled ipv6 support but the 'source-dir/if_pppol2tp.h' lost related structure definitions, we should use both header files from sysroots to fix this build failure. (From OE-Core rev: b536824ea64b8d6729b830738bce637fc815e832) Signed-off-by: Lu Chong Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-connectivity/ppp/ppp_2.4.5.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'meta/recipes-connectivity/ppp/ppp_2.4.5.bb') diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb index dc8c9c110f..e951068181 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb @@ -31,6 +31,7 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \ file://ppp_on_boot \ file://provider \ file://0001-ppp-Add-two-structures-in-if_pppol2tp.h.patch \ + file://0001-ppp-Fix-compilation-errors-in-Makefile.patch \ " SRC_URI[md5sum] = "4621bc56167b6953ec4071043fe0ec57" -- cgit v1.2.3-54-g00ecf