summaryrefslogtreecommitdiffstats
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:15:16 +0100
commitf3e8914ea675217b3c86806522407ea19963d14f (patch)
tree2767def0bbbf3b9206840e354c9441b79c216436
parent6ad0979a6064755fd6d86b568bd3cbbcdd3d4e37 (diff)
downloadopenembedded-core-contrib-f3e8914ea675217b3c86806522407ea19963d14f.tar.gz
openembedded-core-contrib-f3e8914ea675217b3c86806522407ea19963d14f.tar.bz2
openembedded-core-contrib-f3e8914ea675217b3c86806522407ea19963d14f.zip
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. 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.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 @@
+Subject: [PATCH] Don't build-depend on libgcrypt, as nothing is used from it
+
+Backported from http://www.cups.org/strfiles.php/3308/cups-no-gcrypt.patch
+
+This addresses the cryto dependency seen during build.
+
+Upstream-Status: Backport
+
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ cups/libs/cups/http-private.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/cups/libs/cups/http-private.h b/cups/libs/cups/http-private.h
+index 9c88281..94a9817 100644
+--- a/cups/libs/cups/http-private.h
++++ b/cups/libs/cups/http-private.h
+@@ -98,7 +98,6 @@ extern BIO_METHOD *_httpBIOMethods(void);
+ * The GNU TLS library is more of a "bare metal" SSL/TLS library...
+ */
+ # include <gnutls/gnutls.h>
+-# include <gcrypt.h>
+
+ typedef struct
+ {
+--
+2.0.0
+
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} \
file://ghostscript-9.02-genarch.patch \
file://objarch.h \
file://ghostscript-9.02-parallel-make.patch \
+ file://cups-no-gcrypt.patch \
"
SRC_URI_class-native = "${SRC_URI_BASE} \