diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2014-09-01 04:59:56 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-01 17:17:11 +0100 |
commit | 8a0a27d0a722b60eb148b224beb16f48df625625 (patch) | |
tree | d871cb1925d647bba937d52653aca51ca43d3969 | |
parent | 051f6a19f9d1f34d8961b7c5cd664f0def7e168a (diff) | |
download | poky-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>
-rw-r--r-- | meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch | 28 | ||||
-rw-r--r-- | meta/recipes-extended/ghostscript/ghostscript_9.14.bb | 1 |
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 @@ | |||
1 | Subject: [PATCH] Don't build-depend on libgcrypt, as nothing is used from it | ||
2 | |||
3 | Backported from http://www.cups.org/strfiles.php/3308/cups-no-gcrypt.patch | ||
4 | |||
5 | This addresses the cryto dependency seen during build. | ||
6 | |||
7 | Upstream-Status: Backport | ||
8 | |||
9 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
10 | --- | ||
11 | cups/libs/cups/http-private.h | 1 - | ||
12 | 1 file changed, 1 deletion(-) | ||
13 | |||
14 | diff --git a/cups/libs/cups/http-private.h b/cups/libs/cups/http-private.h | ||
15 | index 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 | -- | ||
27 | 2.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 | ||
28 | SRC_URI_class-native = "${SRC_URI_BASE} \ | 29 | SRC_URI_class-native = "${SRC_URI_BASE} \ |