summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster@mvista.com>2014-06-09 18:11:55 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-13 12:31:38 +0100
commitbdf734343a5e033b071c98068a2f921b35534a61 (patch)
tree9547c1f0d4be9612851b0d29d6dd81722820d768
parentd58401cac56e6991361f785596efd21e140e3448 (diff)
downloadpoky-bdf734343a5e033b071c98068a2f921b35534a61.tar.gz
v4 cups: Shouldn't link against libgcrypt without using gcrypt functions
Backported from http://www.cups.org/strfiles.php/3308/cups-no-gcrypt.patch This addresses the cryto dependency seen during build. (From OE-Core rev: e5f9166302baad837244e5a93bedb2797ab17e57) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/cups/cups.inc1
-rw-r--r--meta/recipes-extended/cups/cups/cups-no-gcrypt.patch49
2 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index fd885527c2..3b8027b0a5 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -8,6 +8,7 @@ SRC_URI = "http://www.cups.org/software/${PV}/${BP}-source.tar.bz2 \
8 file://use_echo_only_in_init.patch \ 8 file://use_echo_only_in_init.patch \
9 file://0001-don-t-try-to-run-generated-binaries.patch \ 9 file://0001-don-t-try-to-run-generated-binaries.patch \
10 file://cups_serverbin.patch \ 10 file://cups_serverbin.patch \
11 file://cups-no-gcrypt.patch \
11 " 12 "
12 13
13LEAD_SONAME = "libcupsdriver.so" 14LEAD_SONAME = "libcupsdriver.so"
diff --git a/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch b/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch
new file mode 100644
index 0000000000..8bbcf39497
--- /dev/null
+++ b/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch
@@ -0,0 +1,49 @@
1Description: Don't build-depend on libgcrypt, as nothing is used from it
2Author: Didier Raboud <odyx@debian.org>
3Bug-Debian: https://bugs.debian.org/638416
4Bug: http://www.cups.org/str.php?L????
5
6[CUPS Ticket #4399] -- http://www.cups.org/str.php?L4399
7
8Backported from http://www.cups.org/strfiles.php/3308/cups-no-gcrypt.patch
9
10Upstream-Status: Backport
11
12Signed-off-by: Armin Kuster <akuster@mvista.com>
13
14Last-Update: 2014-04-07
15--- a/config-scripts/cups-ssl.m4
16+++ b/config-scripts/cups-ssl.m4
17@@ -66,7 +66,6 @@
18 dnl Then look for GNU TLS...
19 if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then
20 AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config)
21- AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config)
22 if $PKGCONFIG --exists gnutls; then
23 have_ssl=1
24 SSLLIBS=`$PKGCONFIG --libs gnutls`
25@@ -84,14 +83,6 @@
26 if test $have_ssl = 1; then
27 CUPS_SERVERCERT="ssl/server.crt"
28 CUPS_SERVERKEY="ssl/server.key"
29-
30- if $PKGCONFIG --exists gcrypt; then
31- SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`"
32- SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`"
33- elif test "x$LIBGCRYPTCONFIG" != x; then
34- SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`"
35- SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`"
36- fi
37 fi
38 fi
39
40--- a/cups/http-private.h
41+++ b/cups/http-private.h
42@@ -80,7 +80,6 @@
43 # elif defined HAVE_GNUTLS
44 # include <gnutls/gnutls.h>
45 # include <gnutls/x509.h>
46-# include <gcrypt.h>
47 # elif defined(HAVE_CDSASSL)
48 # include <CoreFoundation/CoreFoundation.h>
49 # include <Security/Security.h>