summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/gnutls/gnutls-2.12.16/configure-fix.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/gnutls/gnutls-2.12.16/configure-fix.patch')
-rw-r--r--meta/recipes-support/gnutls/gnutls-2.12.16/configure-fix.patch65
1 files changed, 65 insertions, 0 deletions
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.16/configure-fix.patch b/meta/recipes-support/gnutls/gnutls-2.12.16/configure-fix.patch
new file mode 100644
index 0000000000..14f87e03d3
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls-2.12.16/configure-fix.patch
@@ -0,0 +1,65 @@
1Upstream-Status: Inappropriate [distribution]
2
3rebased from original configure_madness.patch
4
5libtasn1 provides an .pc file in upstream,
6and a libgcrypt.pc is added in libgcrypt recipe,
7so use Requires.private for these two.
8
9against 2.8.6
10
1107/02/2010 - qhe
12
13---
14Index: gnutls-2.12.11/lib/configure.ac
15===================================================================
16--- gnutls-2.12.11.orig/lib/configure.ac
17+++ gnutls-2.12.11/lib/configure.ac
18@@ -126,8 +126,8 @@ lgl_INIT
19 AC_CHECK_FUNCS(getrusage,,)
20 AC_LIB_HAVE_LINKFLAGS(pthread,, [#include <pthread.h>], [pthread_mutex_lock (0);])
21
22-LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS"
23-LIBGNUTLS_CFLAGS="-I${includedir}"
24+LIBGNUTLS_LIBS="-lgnutls $LIBS"
25+LIBGNUTLS_CFLAGS=""
26 AC_SUBST(LIBGNUTLS_LIBS)
27 AC_SUBST(LIBGNUTLS_CFLAGS)
28
29Index: gnutls-2.12.11/lib/gnutls.pc.in
30===================================================================
31--- gnutls-2.12.11.orig/lib/gnutls.pc.in
32+++ gnutls-2.12.11/lib/gnutls.pc.in
33@@ -20,6 +20,4 @@ Description: Transport Security Layer im
34 URL: http://www.gnu.org/software/gnutls/
35 Version: @VERSION@
36 Libs: -L${libdir} -lgnutls
37-Libs.private: @LTLIBGCRYPT@ @LTLIBNETTLE@ @NETTLE_LIBS@ @GNUTLS_ZLIB_LIBS_PRIVATE@
38-@GNUTLS_REQUIRES_PRIVATE@
39 Cflags: -I${includedir}
40Index: gnutls-2.12.11/libextra/configure.ac
41===================================================================
42--- gnutls-2.12.11.orig/libextra/configure.ac
43+++ gnutls-2.12.11/libextra/configure.ac
44@@ -41,8 +41,8 @@ LIBGNUTLS_EXTRA_HOOKS
45
46 xgl_INIT
47
48-LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
49-LIBGNUTLS_EXTRA_CFLAGS="-I${includedir}"
50+LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
51+LIBGNUTLS_EXTRA_CFLAGS=""
52 AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
53 AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
54
55Index: gnutls-2.12.11/libextra/gnutls-extra.pc.in
56===================================================================
57--- gnutls-2.12.11.orig/libextra/gnutls-extra.pc.in
58+++ gnutls-2.12.11/libextra/gnutls-extra.pc.in
59@@ -22,5 +22,5 @@ URL: http://www.gnu.org/software/gnutls/
60 Requires: gnutls
61 Version: @VERSION@
62 Libs: -L${libdir} -lgnutls-extra
63-Libs.private: @LIBGNUTLS_EXTRA_LIBS@
64+Libs.private: -llzo2
65 Cflags: -I${includedir}