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 | openembedded-core-424278c7bcccf0334ad4680ded30372616d2c9ab.tar.gz openembedded-core-424278c7bcccf0334ad4680ded30372616d2c9ab.tar.bz2 openembedded-core-424278c7bcccf0334ad4680ded30372616d2c9ab.tar.xz openembedded-core-424278c7bcccf0334ad4680ded30372616d2c9ab.zip |
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 000000000..247e32456 --- /dev/null +++ b/meta/packages/gnutls/gnutls-2.8.6/configure-fix.patch @@ -0,0 +1,64 @@ +rebased from original configure_madness.patch + +libtasn1 provides an .pc file in upstream, +and a libgcrypt.pc is added in libgcrypt recipe, +so use Requires.private for these two. + +against 2.8.6 + +07/02/2010 - qhe + +--- +diff --git a/lib/configure.ac b/lib/configure.ac +index 80d3375..1a486f7 100644 +--- a/lib/configure.ac ++++ b/lib/configure.ac +@@ -81,8 +81,8 @@ fi + + lgl_INIT + +-LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS" +-LIBGNUTLS_CFLAGS="-I${includedir}" ++LIBGNUTLS_LIBS="-lgnutls $LIBS" ++LIBGNUTLS_CFLAGS="" + AC_SUBST(LIBGNUTLS_LIBS) + AC_SUBST(LIBGNUTLS_CFLAGS) + +diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in +index 3b01c17..de31469 100644 +--- a/lib/gnutls.pc.in ++++ b/lib/gnutls.pc.in +@@ -20,6 +20,6 @@ Name: GnuTLS + Description: Transport Security Layer implementation for the GNU system + URL: http://www.gnu.org/software/gnutls/ + Version: @VERSION@ ++Requires.private: libgcrypt, libtasn1 + Libs: -L${libdir} -lgnutls +-Libs.private: @LIBGNUTLS_LIBS@ @LTLIBTASN1@ + Cflags: -I${includedir} +diff --git a/libextra/configure.ac b/libextra/configure.ac +index c08e73f..3313886 100644 +--- a/libextra/configure.ac ++++ b/libextra/configure.ac +@@ -40,8 +40,8 @@ LIBGNUTLS_EXTRA_HOOKS + + xgl_INIT + +-LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS" +-LIBGNUTLS_EXTRA_CFLAGS="-I${includedir}" ++LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS" ++LIBGNUTLS_EXTRA_CFLAGS="" + AC_SUBST(LIBGNUTLS_EXTRA_LIBS) + AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS) + +diff --git a/libextra/gnutls-extra.pc.in b/libextra/gnutls-extra.pc.in +index 9e7b8f6..e228ec9 100644 +--- a/libextra/gnutls-extra.pc.in ++++ b/libextra/gnutls-extra.pc.in +@@ -21,5 +21,5 @@ URL: http://www.gnu.org/software/gnutls/ + Requires: gnutls + Version: @VERSION@ + Libs: -L${libdir} -lgnutls-extra +-Libs.private: @LIBGNUTLS_EXTRA_LIBS@ ++Libs.private: -llzo2 + Cflags: -I${includedir} |