diff options
| author | Armin Kuster <akuster@mvista.com> | 2014-06-09 18:11:55 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-13 12:28:34 +0100 |
| commit | e5f9166302baad837244e5a93bedb2797ab17e57 (patch) | |
| tree | 38b63bbf9ad2220e08c6d23bf48872366f459c04 | |
| parent | 160087f754eabf5da90fb51997e19d2e585aac4a (diff) | |
| download | openembedded-core-e5f9166302baad837244e5a93bedb2797ab17e57.tar.gz openembedded-core-e5f9166302baad837244e5a93bedb2797ab17e57.tar.bz2 openembedded-core-e5f9166302baad837244e5a93bedb2797ab17e57.zip | |
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.
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.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-extended/cups/cups/cups-no-gcrypt.patch | 49 |
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 \ file://use_echo_only_in_init.patch \ file://0001-don-t-try-to-run-generated-binaries.patch \ file://cups_serverbin.patch \ + file://cups-no-gcrypt.patch \ " LEAD_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 @@ +Description: Don't build-depend on libgcrypt, as nothing is used from it +Author: Didier Raboud <odyx@debian.org> +Bug-Debian: https://bugs.debian.org/638416 +Bug: http://www.cups.org/str.php?L???? + +[CUPS Ticket #4399] -- http://www.cups.org/str.php?L4399 + +Backported from http://www.cups.org/strfiles.php/3308/cups-no-gcrypt.patch + +Upstream-Status: Backport + +Signed-off-by: Armin Kuster <akuster@mvista.com> + +Last-Update: 2014-04-07 +--- a/config-scripts/cups-ssl.m4 ++++ b/config-scripts/cups-ssl.m4 +@@ -66,7 +66,6 @@ + dnl Then look for GNU TLS... + if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then + AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config) +- AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config) + if $PKGCONFIG --exists gnutls; then + have_ssl=1 + SSLLIBS=`$PKGCONFIG --libs gnutls` +@@ -84,14 +83,6 @@ + if test $have_ssl = 1; then + CUPS_SERVERCERT="ssl/server.crt" + CUPS_SERVERKEY="ssl/server.key" +- +- if $PKGCONFIG --exists gcrypt; then +- SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`" +- SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`" +- elif test "x$LIBGCRYPTCONFIG" != x; then +- SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`" +- SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`" +- fi + fi + fi + +--- a/cups/http-private.h ++++ b/cups/http-private.h +@@ -80,7 +80,6 @@ + # elif defined HAVE_GNUTLS + # include <gnutls/gnutls.h> + # include <gnutls/x509.h> +-# include <gcrypt.h> + # elif defined(HAVE_CDSASSL) + # include <CoreFoundation/CoreFoundation.h> + # include <Security/Security.h> |