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