summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch')
-rw-r--r--meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch64
1 files changed, 64 insertions, 0 deletions
diff --git a/meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch b/meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch
new file mode 100644
index 0000000000..247e324564
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch
@@ -0,0 +1,64 @@
1rebased from original configure_madness.patch
2
3libtasn1 provides an .pc file in upstream,
4and a libgcrypt.pc is added in libgcrypt recipe,
5so use Requires.private for these two.
6
7against 2.8.6
8
907/02/2010 - qhe
10
11---
12diff --git a/lib/configure.ac b/lib/configure.ac
13index 80d3375..1a486f7 100644
14--- a/lib/configure.ac
15+++ b/lib/configure.ac
16@@ -81,8 +81,8 @@ fi
17
18 lgl_INIT
19
20-LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS"
21-LIBGNUTLS_CFLAGS="-I${includedir}"
22+LIBGNUTLS_LIBS="-lgnutls $LIBS"
23+LIBGNUTLS_CFLAGS=""
24 AC_SUBST(LIBGNUTLS_LIBS)
25 AC_SUBST(LIBGNUTLS_CFLAGS)
26
27diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
28index 3b01c17..de31469 100644
29--- a/lib/gnutls.pc.in
30+++ b/lib/gnutls.pc.in
31@@ -20,6 +20,6 @@ Name: GnuTLS
32 Description: Transport Security Layer implementation for the GNU system
33 URL: http://www.gnu.org/software/gnutls/
34 Version: @VERSION@
35+Requires.private: libgcrypt, libtasn1
36 Libs: -L${libdir} -lgnutls
37-Libs.private: @LIBGNUTLS_LIBS@ @LTLIBTASN1@
38 Cflags: -I${includedir}
39diff --git a/libextra/configure.ac b/libextra/configure.ac
40index c08e73f..3313886 100644
41--- a/libextra/configure.ac
42+++ b/libextra/configure.ac
43@@ -40,8 +40,8 @@ LIBGNUTLS_EXTRA_HOOKS
44
45 xgl_INIT
46
47-LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
48-LIBGNUTLS_EXTRA_CFLAGS="-I${includedir}"
49+LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
50+LIBGNUTLS_EXTRA_CFLAGS=""
51 AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
52 AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
53
54diff --git a/libextra/gnutls-extra.pc.in b/libextra/gnutls-extra.pc.in
55index 9e7b8f6..e228ec9 100644
56--- a/libextra/gnutls-extra.pc.in
57+++ b/libextra/gnutls-extra.pc.in
58@@ -21,5 +21,5 @@ URL: http://www.gnu.org/software/gnutls/
59 Requires: gnutls
60 Version: @VERSION@
61 Libs: -L${libdir} -lgnutls-extra
62-Libs.private: @LIBGNUTLS_EXTRA_LIBS@
63+Libs.private: -llzo2
64 Cflags: -I${includedir}