diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2016-01-07 01:31:10 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-15 11:54:50 +0000 |
commit | 4cb226954a909d0d6456bffbc857a8d966cc26c0 (patch) | |
tree | c07ba4f80d618e91a278682206213a24619fa51c /meta/recipes-extended/iputils/files | |
parent | fe47dd7bf5bf4c0cfdc8689f25ea5e2f4fa267bb (diff) | |
download | poky-4cb226954a909d0d6456bffbc857a8d966cc26c0.tar.gz |
iputils: s20121221 -> s20151218
* Remove fix-build-command-line-argument-with-gnutls.patch which is
already in the source.
* Add libgcrypt to DEPENDS since it depends on it.
(From OE-Core rev: 119a121e4dbf48db67544c4c7fca40a1abcf1146)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/iputils/files')
-rw-r--r-- | meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch | 37 |
1 files changed, 0 insertions, 37 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 deleted file mode 100644 index b9cd82ee88..0000000000 --- a/meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
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 | |||