diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2014-03-03 16:27:30 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-05 15:50:21 +0000 |
commit | 3bd5c238bc17a41b8f5986865b44693d2e4492bf (patch) | |
tree | a8ad7572b9d7b8e982ddefcd686f90b81c82a622 /meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch | |
parent | 5da3ba5457aa6c445d61bac10be37f2aa1548a28 (diff) | |
download | poky-3bd5c238bc17a41b8f5986865b44693d2e4492bf.tar.gz |
ppp: upgrade to 2.4.6
(From OE-Core rev: d05b1d06b5b8b84c2a40639ad28e31cd683f89a4)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch')
-rw-r--r-- | meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch b/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch new file mode 100644 index 0000000000..d59717ebd3 --- /dev/null +++ b/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | The patch comes from OpenEmbedded. | ||
2 | Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com> | ||
3 | |||
4 | Updated from OE-Classic to include the pcap hunk. | ||
5 | Signed-off-by: Andreas Oberritter <obi@opendreambox.org> | ||
6 | |||
7 | Upstream-Status: Inappropriate [configuration] | ||
8 | |||
9 | diff -urN ppp-2.4.5-orig/pppd/Makefile.linux ppp-2.4.5/pppd/Makefile.linux | ||
10 | --- ppp-2.4.5-orig/pppd/Makefile.linux 2010-06-30 15:51:12.043682063 +0800 | ||
11 | +++ ppp-2.4.5/pppd/Makefile.linux 2010-06-30 17:08:21.806363042 +0800 | ||
12 | @@ -117,10 +117,10 @@ | ||
13 | #LIBS += -lshadow $(LIBS) | ||
14 | endif | ||
15 | |||
16 | -ifneq ($(wildcard /usr/include/crypt.h),) | ||
17 | +#ifneq ($(wildcard /usr/include/crypt.h),) | ||
18 | CFLAGS += -DHAVE_CRYPT_H=1 | ||
19 | LIBS += -lcrypt | ||
20 | -endif | ||
21 | +#endif | ||
22 | |||
23 | ifdef NEEDDES | ||
24 | ifndef USE_CRYPT | ||
25 | @@ -169,10 +169,10 @@ | ||
26 | endif | ||
27 | |||
28 | ifdef FILTER | ||
29 | -ifneq ($(wildcard /usr/include/pcap-bpf.h),) | ||
30 | +#ifneq ($(wildcard /usr/include/pcap-bpf.h),) | ||
31 | LIBS += -lpcap | ||
32 | CFLAGS += -DPPP_FILTER | ||
33 | -endif | ||
34 | +#endif | ||
35 | endif | ||
36 | |||
37 | ifdef HAVE_INET6 | ||