diff options
author | Saul Wold <sgw@linux.intel.com> | 2011-11-30 21:12:31 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-01 10:39:00 +0000 |
commit | 1c7fbbf6cbdcf804c232c750f10b0a967204e54a (patch) | |
tree | 7be100c46c469e9f8c10a65ba1e786560d69b560 /meta/recipes-support/gnutls/gnutls-2.12.14/configure-fix.patch | |
parent | e2a427ef463b2892c17d0007619eb6b08a050414 (diff) | |
download | openembedded-core-1c7fbbf6cbdcf804c232c750f10b0a967204e54a.tar.gz openembedded-core-1c7fbbf6cbdcf804c232c750f10b0a967204e54a.tar.bz2 openembedded-core-1c7fbbf6cbdcf804c232c750f10b0a967204e54a.tar.xz openembedded-core-1c7fbbf6cbdcf804c232c750f10b0a967204e54a.zip |
gnutls: Update to 2.12.14
* Add patch for fixing gettext version from 0.17 -> 0.18
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gnutls/gnutls-2.12.14/configure-fix.patch')
-rw-r--r-- | meta/recipes-support/gnutls/gnutls-2.12.14/configure-fix.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.14/configure-fix.patch b/meta/recipes-support/gnutls/gnutls-2.12.14/configure-fix.patch new file mode 100644 index 000000000..14f87e03d --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls-2.12.14/configure-fix.patch @@ -0,0 +1,65 @@ +Upstream-Status: Inappropriate [distribution] + +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 + +--- +Index: gnutls-2.12.11/lib/configure.ac +=================================================================== +--- gnutls-2.12.11.orig/lib/configure.ac ++++ gnutls-2.12.11/lib/configure.ac +@@ -126,8 +126,8 @@ lgl_INIT + AC_CHECK_FUNCS(getrusage,,) + AC_LIB_HAVE_LINKFLAGS(pthread,, [#include <pthread.h>], [pthread_mutex_lock (0);]) + +-LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS" +-LIBGNUTLS_CFLAGS="-I${includedir}" ++LIBGNUTLS_LIBS="-lgnutls $LIBS" ++LIBGNUTLS_CFLAGS="" + AC_SUBST(LIBGNUTLS_LIBS) + AC_SUBST(LIBGNUTLS_CFLAGS) + +Index: gnutls-2.12.11/lib/gnutls.pc.in +=================================================================== +--- gnutls-2.12.11.orig/lib/gnutls.pc.in ++++ gnutls-2.12.11/lib/gnutls.pc.in +@@ -20,6 +20,4 @@ Description: Transport Security Layer im + URL: http://www.gnu.org/software/gnutls/ + Version: @VERSION@ + Libs: -L${libdir} -lgnutls +-Libs.private: @LTLIBGCRYPT@ @LTLIBNETTLE@ @NETTLE_LIBS@ @GNUTLS_ZLIB_LIBS_PRIVATE@ +-@GNUTLS_REQUIRES_PRIVATE@ + Cflags: -I${includedir} +Index: gnutls-2.12.11/libextra/configure.ac +=================================================================== +--- gnutls-2.12.11.orig/libextra/configure.ac ++++ gnutls-2.12.11/libextra/configure.ac +@@ -41,8 +41,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) + +Index: gnutls-2.12.11/libextra/gnutls-extra.pc.in +=================================================================== +--- gnutls-2.12.11.orig/libextra/gnutls-extra.pc.in ++++ gnutls-2.12.11/libextra/gnutls-extra.pc.in +@@ -22,5 +22,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} |