| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame^] | 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 | |