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-13 00:03:54 +0000 |
commit | 119a121e4dbf48db67544c4c7fca40a1abcf1146 (patch) | |
tree | a467f7e11a1bde5d275878c913236b7ad34b5221 /meta/recipes-extended/iputils/files | |
parent | f2a4a5e7e237fd0a3ab13a16f2674c41e1a3c853 (diff) | |
download | openembedded-core-contrib-119a121e4dbf48db67544c4c7fca40a1abcf1146.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.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
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 @@ -Upstream-Status: Backport - -From 568e990d30fc7e9416e0a6f8c74ea5013921eaec Mon Sep 17 00:00:00 2001 -From: Arjan van de Ven <arjanvandeven@gmail.com> -Date: Wed, 16 Jan 2013 03:12:15 +0900 -Subject: [PATCH] ping6: Fix build command line argument with gnutls. - -The ping6 command can use either openssl or gnutls... -and the Makefile has a bunch of setup for defining which of the two to use. - -Unfortunately, the final -D define on the commandline to enable gnutls -inside the ping6.c file didn't actually make it onto the gcc -commandline. -This patch adds the $(DEF_CRYPTO) Makefile variable to fix this gap. - -Signed-off-by: Arjan van de Ven <arjanvandeven@gmail.com> -Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> ---- - Makefile | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Makefile b/Makefile -index c62d9df..89249f5 100644 ---- a/Makefile -+++ b/Makefile -@@ -149,7 +149,7 @@ LIB_clockdiff = $(LIB_CAP) - DEF_ping_common = $(DEF_CAP) $(DEF_IDN) - DEF_ping = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) - LIB_ping = $(LIB_CAP) $(LIB_IDN) --DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR) -+DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR) $(DEF_CRYPTO) - LIB_ping6 = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV) $(LIB_CRYPTO) - - ping: ping_common.o --- -1.7.2.5 - |