diff options
Diffstat (limited to 'meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch')
-rw-r--r-- | meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch b/meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch new file mode 100644 index 0000000000..e6f9785a99 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch | |||
@@ -0,0 +1,67 @@ | |||
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 | Index: gnutls-2.12.5/lib/configure.ac | ||
15 | =================================================================== | ||
16 | --- gnutls-2.12.5.orig/lib/configure.ac 2011-05-11 00:05:33.000000000 -0700 | ||
17 | +++ gnutls-2.12.5/lib/configure.ac 2011-05-25 19:45:23.721180103 -0700 | ||
18 | @@ -96,8 +96,8 @@ | ||
19 | dnl for pakchois | ||
20 | AC_LIB_HAVE_LINKFLAGS(dl,, [#include <dlfcn.h>], [dlclose (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 | |||
29 | Index: gnutls-2.12.5/lib/gnutls.pc.in | ||
30 | =================================================================== | ||
31 | --- gnutls-2.12.5.orig/lib/gnutls.pc.in 2011-04-23 08:00:07.000000000 -0700 | ||
32 | +++ gnutls-2.12.5/lib/gnutls.pc.in 2011-05-25 19:50:11.926102288 -0700 | ||
33 | @@ -19,7 +19,6 @@ | ||
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: @LTLIBGCRYPT@ @NETTLE_LIBS@ | ||
40 | -@GNUTLS_REQUIRES_PRIVATE@ | ||
41 | Cflags: -I${includedir} | ||
42 | Index: gnutls-2.12.5/libextra/configure.ac | ||
43 | =================================================================== | ||
44 | --- gnutls-2.12.5.orig/libextra/configure.ac 2011-05-11 00:05:31.000000000 -0700 | ||
45 | +++ gnutls-2.12.5/libextra/configure.ac 2011-05-25 19:45:23.722186801 -0700 | ||
46 | @@ -41,8 +41,8 @@ | ||
47 | |||
48 | xgl_INIT | ||
49 | |||
50 | -LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS" | ||
51 | -LIBGNUTLS_EXTRA_CFLAGS="-I${includedir}" | ||
52 | +LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS" | ||
53 | +LIBGNUTLS_EXTRA_CFLAGS="" | ||
54 | AC_SUBST(LIBGNUTLS_EXTRA_LIBS) | ||
55 | AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS) | ||
56 | |||
57 | Index: gnutls-2.12.5/libextra/gnutls-extra.pc.in | ||
58 | =================================================================== | ||
59 | --- gnutls-2.12.5.orig/libextra/gnutls-extra.pc.in 2011-04-07 17:30:45.000000000 -0700 | ||
60 | +++ gnutls-2.12.5/libextra/gnutls-extra.pc.in 2011-05-25 19:45:23.722186801 -0700 | ||
61 | @@ -22,5 +22,5 @@ | ||
62 | Requires: gnutls | ||
63 | Version: @VERSION@ | ||
64 | Libs: -L${libdir} -lgnutls-extra | ||
65 | -Libs.private: @LIBGNUTLS_EXTRA_LIBS@ | ||
66 | +Libs.private: -llzo2 | ||
67 | Cflags: -I${includedir} | ||