Attachment 56190 Details for Bug 43992 – Remove <gcrypt.h> and other remnants of gcrypt

[patch] Remove <gcrypt.h> and other remnants of gcrypt

0003-Remove-gcrypt.h-and-other-remnants-of-gcrypt.patch (text/plain), 1.94 KB, created by Simon McVittie on 2012-01-26 08:01:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-01-26 08:01:21 UTC

Size: 1.94 KB

patch

obsolete

>From d3d46e381ae2186c967daf5c82d27863ad797da0 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 26 Jan 2012 16:00:23 +0000
>Subject: [PATCH 3/3] Remove <gcrypt.h> and other remnants of gcrypt
>
>This doesn't seem to be used for anything, and creates an artificial
>dependency on gcrypt, which GNUTLS 3 no longer uses.
>
>Verified to pass tests on Debian's gnutls26 2.12.16-1 package, but
>insufficient to make tests pass on gnutls28 3.0.12-1.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=43992
>Bug-Debian: http://bugs.debian.org/638420
>---
> Android.mk        |    2 +-
> wocky/Makefile.am |    2 +-
> wocky/wocky-tls.c |    1 -
> 3 files changed, 2 insertions(+), 3 deletions(-)
>
>diff --git a/Android.mk b/Android.mk
>index fb33af9..b9f2c9d 100644
>--- a/Android.mk
>+++ b/Android.mk
>@@ -12,7 +12,7 @@ wocky-configure-real:
> 	LD=$(TARGET_LD) \
> 	LDFLAGS="$(CONFIGURE_LDFLAGS)" \
> 	CPP=$(CONFIGURE_CPP) \
>-	CPPFLAGS="$(CONFIGURE_CPPFLAGS) -I$(GCRYPT_TOP)/src -I$(GPG_ERROR_TOP)/src" \
>+	CPPFLAGS="$(CONFIGURE_CPPFLAGS)" \
> 	PKG_CONFIG_LIBDIR="$(CONFIGURE_PKG_CONFIG_LIBDIR)" \
> 	PKG_CONFIG_TOP_BUILD_DIR=$(PKG_CONFIG_TOP_BUILD_DIR) \
> 	$(WOCKY_TOP)/$(CONFIGURE) --host=arm-linux-androideabi \
>diff --git a/wocky/Makefile.am b/wocky/Makefile.am
>index 3dcd81a..1a15061 100644
>--- a/wocky/Makefile.am
>+++ b/wocky/Makefile.am
>@@ -244,5 +244,5 @@ Android.mk: Makefile.am $(built_sources) $(built_headers)
> 	 -:SOURCES $(handwritten_sources) $(built_sources) \
> 	 -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFLAGS) \
> 	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
>-	 -:LDFLAGS $(AM_LDFLAGS) $(GCRYPT_LIBS) \
>+	 -:LDFLAGS $(AM_LDFLAGS) \
> 	> $@
>diff --git a/wocky/wocky-tls.c b/wocky/wocky-tls.c
>index 796ac47..691b25b 100644
>--- a/wocky/wocky-tls.c
>+++ b/wocky/wocky-tls.c
>@@ -96,7 +96,6 @@
> #include <gnutls/gnutls.h>
> #include <string.h>
> #include <errno.h>
>-#include <gcrypt.h>
> #include <sys/types.h>
> #include <unistd.h>
> enum
>-- 
>1.7.8.3
>

Actions: View | Splinter Review

Attachments on bug 43992: 56189 | 56190

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.