summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2014-09-01 04:59:56 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-01 17:17:11 +0100
commit8a0a27d0a722b60eb148b224beb16f48df625625 (patch)
treed871cb1925d647bba937d52653aca51ca43d3969 /meta/recipes-extended
parent051f6a19f9d1f34d8961b7c5cd664f0def7e168a (diff)
downloadpoky-8a0a27d0a722b60eb148b224beb16f48df625625.tar.gz
ghostscript: Don't build-depend on libgcrypt for the local cups
Backported for the ghostscript supplied cups code from http://www.cups.org/strfiles.php/3308/cups-no-gcrypt.patch This addresses the cryto dependency seen during build. (From OE-Core rev: f3e8914ea675217b3c86806522407ea19963d14f) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch28
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript_9.14.bb1
2 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch b/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch
new file mode 100644
index 0000000000..1c0a6d5da5
--- /dev/null
+++ b/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch
@@ -0,0 +1,28 @@
1Subject: [PATCH] Don't build-depend on libgcrypt, as nothing is used from it
2
3Backported from http://www.cups.org/strfiles.php/3308/cups-no-gcrypt.patch
4
5This addresses the cryto dependency seen during build.
6
7Upstream-Status: Backport
8
9Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
10---
11 cups/libs/cups/http-private.h | 1 -
12 1 file changed, 1 deletion(-)
13
14diff --git a/cups/libs/cups/http-private.h b/cups/libs/cups/http-private.h
15index 9c88281..94a9817 100644
16--- a/cups/libs/cups/http-private.h
17+++ b/cups/libs/cups/http-private.h
18@@ -98,7 +98,6 @@ extern BIO_METHOD *_httpBIOMethods(void);
19 * The GNU TLS library is more of a "bare metal" SSL/TLS library...
20 */
21 # include <gnutls/gnutls.h>
22-# include <gcrypt.h>
23
24 typedef struct
25 {
26--
272.0.0
28
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.14.bb b/meta/recipes-extended/ghostscript/ghostscript_9.14.bb
index 2e892f3e10..130dc1c378 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.14.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.14.bb
@@ -23,6 +23,7 @@ SRC_URI = "${SRC_URI_BASE} \
23 file://ghostscript-9.02-genarch.patch \ 23 file://ghostscript-9.02-genarch.patch \
24 file://objarch.h \ 24 file://objarch.h \
25 file://ghostscript-9.02-parallel-make.patch \ 25 file://ghostscript-9.02-parallel-make.patch \
26 file://cups-no-gcrypt.patch \
26 " 27 "
27 28
28SRC_URI_class-native = "${SRC_URI_BASE} \ 29SRC_URI_class-native = "${SRC_URI_BASE} \