Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 9129eb7fa9dc160d64a7d9df9279a3b1dae4d793 Mon Sep 17 00:00:00 2001 |
| 2 | From: Jackie Huang <jackie.huang@windriver.com> |
| 3 | Date: Thu, 29 Mar 2018 16:16:18 +0800 |
| 4 | Subject: [PATCH 08/10] cups no gcrypt |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 6 | Don't build-depend on libgcrypt, as nothing is used from it |
| 7 | |
| 8 | Backported from |
| 9 | http://www.cups.org/strfiles.php/3308/cups-no-gcrypt.patch |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 10 | |
| 11 | This addresses the cryto dependency seen during build. |
| 12 | |
| 13 | Upstream-Status: Backport |
| 14 | |
| 15 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> |
| 16 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 17 | Rebase to 9.23 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 18 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 19 | --- |
| 20 | cups/libs/cups/http-private.h | 1 - |
| 21 | 1 file changed, 1 deletion(-) |
| 22 | |
| 23 | diff --git a/cups/libs/cups/http-private.h b/cups/libs/cups/http-private.h |
| 24 | index 99a85c3..a674852 100644 |
| 25 | --- a/cups/libs/cups/http-private.h |
| 26 | +++ b/cups/libs/cups/http-private.h |
| 27 | @@ -80,7 +80,6 @@ typedef int socklen_t; |
| 28 | # elif defined HAVE_GNUTLS |
| 29 | # include <gnutls/gnutls.h> |
| 30 | # include <gnutls/x509.h> |
| 31 | -# include <gcrypt.h> |
| 32 | # elif defined(HAVE_CDSASSL) |
| 33 | # include <CoreFoundation/CoreFoundation.h> |
| 34 | # include <Security/Security.h> |
| 35 | -- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 36 | 1.8.3.1 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 37 | |