diff options
| author | Lu Chong <Chong.Lu@windriver.com> | 2013-11-05 18:39:26 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-08 17:25:35 +0000 |
| commit | 3a5ab77e8e29c9e2929185acb13e7fdae53dea18 (patch) | |
| tree | d9e1c5750134dafcc6d134955755b43483db515c /meta/recipes-connectivity/ppp/ppp_2.4.5.bb | |
| parent | 530c87bfc9a9ed2c1cb8b37f8a90083da1e2df02 (diff) | |
| download | poky-3a5ab77e8e29c9e2929185acb13e7fdae53dea18.tar.gz | |
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 <Chong.Lu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/ppp/ppp_2.4.5.bb')
| -rw-r--r-- | meta/recipes-connectivity/ppp/ppp_2.4.5.bb | 1 |
1 files changed, 1 insertions, 0 deletions
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 \ | |||
| 31 | file://ppp_on_boot \ | 31 | file://ppp_on_boot \ |
| 32 | file://provider \ | 32 | file://provider \ |
| 33 | file://0001-ppp-Add-two-structures-in-if_pppol2tp.h.patch \ | 33 | file://0001-ppp-Add-two-structures-in-if_pppol2tp.h.patch \ |
| 34 | file://0001-ppp-Fix-compilation-errors-in-Makefile.patch \ | ||
| 34 | " | 35 | " |
| 35 | 36 | ||
| 36 | SRC_URI[md5sum] = "4621bc56167b6953ec4071043fe0ec57" | 37 | SRC_URI[md5sum] = "4621bc56167b6953ec4071043fe0ec57" |
