diff options
author | Radu Moisan <radu.moisan@intel.com> | 2013-07-10 12:24:11 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-13 18:23:32 +0100 |
commit | 5f863410d79aad9e9e368294ff37288bf36f4403 (patch) | |
tree | b3ada5765e55de9a8bec66a5acf74322fdf786fa /meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch | |
parent | db9775f57a6634bfc0da5fedfde1b2df1768c8fa (diff) | |
download | poky-5f863410d79aad9e9e368294ff37288bf36f4403.tar.gz |
iputils: Upgrade to v20121221
Removed obsolete patches
Header for arping changed. New author added.
Capability support enabled by default(upstream) -> added libcap to DEPENDS
Gnutls enabled by default(upstream) -> switched from openssl to gnutls
(From OE-Core rev: 52ca4ac9f3af16fe99b28eaeaff8bb52f86eb24c)
Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch')
-rw-r--r-- | meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch b/meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch new file mode 100644 index 0000000000..b9cd82ee88 --- /dev/null +++ b/meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | From 568e990d30fc7e9416e0a6f8c74ea5013921eaec Mon Sep 17 00:00:00 2001 | ||
4 | From: Arjan van de Ven <arjanvandeven@gmail.com> | ||
5 | Date: Wed, 16 Jan 2013 03:12:15 +0900 | ||
6 | Subject: [PATCH] ping6: Fix build command line argument with gnutls. | ||
7 | |||
8 | The ping6 command can use either openssl or gnutls... | ||
9 | and the Makefile has a bunch of setup for defining which of the two to use. | ||
10 | |||
11 | Unfortunately, the final -D define on the commandline to enable gnutls | ||
12 | inside the ping6.c file didn't actually make it onto the gcc | ||
13 | commandline. | ||
14 | This patch adds the $(DEF_CRYPTO) Makefile variable to fix this gap. | ||
15 | |||
16 | Signed-off-by: Arjan van de Ven <arjanvandeven@gmail.com> | ||
17 | Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | ||
18 | --- | ||
19 | Makefile | 2 +- | ||
20 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
21 | |||
22 | diff --git a/Makefile b/Makefile | ||
23 | index c62d9df..89249f5 100644 | ||
24 | --- a/Makefile | ||
25 | +++ b/Makefile | ||
26 | @@ -149,7 +149,7 @@ LIB_clockdiff = $(LIB_CAP) | ||
27 | DEF_ping_common = $(DEF_CAP) $(DEF_IDN) | ||
28 | DEF_ping = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) | ||
29 | LIB_ping = $(LIB_CAP) $(LIB_IDN) | ||
30 | -DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR) | ||
31 | +DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR) $(DEF_CRYPTO) | ||
32 | LIB_ping6 = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV) $(LIB_CRYPTO) | ||
33 | |||
34 | ping: ping_common.o | ||
35 | -- | ||
36 | 1.7.2.5 | ||
37 | |||