diff options
author | Qing He <qing.he@intel.com> | 2010-06-23 15:07:39 +0800 |
---|---|---|
committer | Saul Wold <Saul.Wold@intel.com> | 2010-07-08 21:11:00 -0700 |
commit | 424278c7bcccf0334ad4680ded30372616d2c9ab (patch) | |
tree | 682c4edf7fe8853bef3c34b3135bd9b00d6e2e03 /meta/packages/gnutls/gnutls-2.8.6/configure-fix.patch | |
parent | 8a556a8ca5dfd22e06de57eaf7744ace1d0974a5 (diff) | |
download | poky-424278c7bcccf0334ad4680ded30372616d2c9ab.tar.gz |
gnutls: upgrade to version 2.8.6
from 2.4.2
add homepage and bugtracker
clarify licensing to GPL & LGPL for different sub packages
changes:
- use EXTRA_OECONF to explicitly specify libgcrypt path
- remove multiple aclocal.m4s and distributed libtool m4
scripts to produce sanity environment, otherwise it may
complain about libtool version mismatch at compilation
- rebase configure_madness.patch to adapt new autotools
scripts, change libgnutls.pc.in and libgnutls-extra.pc.in
to fix pkg-config issues
- rebase the other patches
- remove duplicated inheritence
- depends explictly on libgcrypt (>= 1.4.2), or configure
fails
- use standalone version of libtasn1, and add it as a build
dependency on libatsn1
- add --disable-rpath in EXTRA_OECONF to avoid the rpath
pollution by --with-<pkg>-prefix=
Signed-off-by: Qing He <qing.he@intel.com>
Diffstat (limited to 'meta/packages/gnutls/gnutls-2.8.6/configure-fix.patch')
-rw-r--r-- | meta/packages/gnutls/gnutls-2.8.6/configure-fix.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/meta/packages/gnutls/gnutls-2.8.6/configure-fix.patch b/meta/packages/gnutls/gnutls-2.8.6/configure-fix.patch new file mode 100644 index 0000000000..247e324564 --- /dev/null +++ b/meta/packages/gnutls/gnutls-2.8.6/configure-fix.patch | |||
@@ -0,0 +1,64 @@ | |||
1 | rebased from original configure_madness.patch | ||
2 | |||
3 | libtasn1 provides an .pc file in upstream, | ||
4 | and a libgcrypt.pc is added in libgcrypt recipe, | ||
5 | so use Requires.private for these two. | ||
6 | |||
7 | against 2.8.6 | ||
8 | |||
9 | 07/02/2010 - qhe | ||
10 | |||
11 | --- | ||
12 | diff --git a/lib/configure.ac b/lib/configure.ac | ||
13 | index 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 | |||
27 | diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in | ||
28 | index 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} | ||
39 | diff --git a/libextra/configure.ac b/libextra/configure.ac | ||
40 | index 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 | |||
54 | diff --git a/libextra/gnutls-extra.pc.in b/libextra/gnutls-extra.pc.in | ||
55 | index 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} | ||