summaryrefslogtreecommitdiffstats
path: root/recipes-support/gnutls
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2017-06-12 18:22:18 +0200
committerRoss Burton <ross.burton@intel.com>2017-06-12 20:13:53 +0100
commitd1ab8b5b8d106d380f27e9157c94ec8ae2c6da30 (patch)
treedfa1d1e86f14625d60ea3aa9ec6098d019c9a540 /recipes-support/gnutls
parent9397c157eef1ff74e41f5a82faceb6dc3f672a0c (diff)
downloadmeta-gplv2-d1ab8b5b8d106d380f27e9157c94ec8ae2c6da30.tar.gz
gnutls: add use-pkg-config-to-locate-zlib.patch
* it was modified in oe-core/master in this commit: commit ba7e5f51327d9833776aa066f30c5e46606be374 Author: Fan Xin <fan.xin@jp.fujitsu.com> Date: Fri Jun 9 15:49:18 2017 +0900 gnutls: Upgrade to 3.5.13 1. Upgrade gnutls from 3.5.9 to 3.5.13 2. Rebase the following patch file. use-pkg-config-to-locate-zlib.patch Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> Signed-off-by: Ross Burton <ross.burton@intel.com> and no longer applies for this version. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'recipes-support/gnutls')
-rw-r--r--recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch67
-rw-r--r--recipes-support/gnutls/gnutls_3.3.27.bb2
2 files changed, 68 insertions, 1 deletions
diff --git a/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch b/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch
new file mode 100644
index 0000000..0e1b7c8
--- /dev/null
+++ b/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch
@@ -0,0 +1,67 @@
1From cee80af1fe93f5b76765afeebfcc3b902768f5d6 Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Tue, 26 May 2015 21:41:24 -0700
4Subject: [PATCH] use pkg-config to locate zlib
5
6AC_LIB_HAVE_LINKFLAGS can sometimes find host libs and is therefore not
7robust when cross-compiling. Remove it for zlib and use PKG_CHECK_MODULES
8instead.
9
10Removing AC_LIB_HAVE_LINKFLAGS for zlib also removes the --with-libz-prefix
11configure option. If zlib support is enabled, then failure to find zlib via
12pkg-config is now treated as a fatal error.
13
14Change based on ChromeOS gnutls 2.12.23 cross-compile fixes patch:
15
16 https://chromium-review.googlesource.com/#/c/271661/
17
18Upstream-Status: Inappropriate [configuration]
19
20Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
21---
22 configure.ac | 24 ++++++++++--------------
23 1 file changed, 10 insertions(+), 14 deletions(-)
24
25diff --git a/configure.ac b/configure.ac
26index 1b561d5..0c787dc 100644
27--- a/configure.ac
28+++ b/configure.ac
29@@ -508,25 +508,21 @@ AC_ARG_WITH(zlib, AS_HELP_STRING([--without-zlib],
30 AC_MSG_CHECKING([whether to include zlib compression support])
31 if test x$ac_zlib != xno; then
32 AC_MSG_RESULT(yes)
33- AC_LIB_HAVE_LINKFLAGS(z,, [#include <zlib.h>], [compress (0, 0, 0, 0);])
34- if test x$ac_cv_libz != xyes; then
35- AC_MSG_WARN(
36-***
37-*** ZLIB was not found. You will not be able to use ZLIB compression.)
38- fi
39 else
40 AC_MSG_RESULT(no)
41 fi
42
43-PKG_CHECK_EXISTS(zlib, ZLIB_HAS_PKGCONFIG=y, ZLIB_HAS_PKGCONFIG=n)
44-
45 if test x$ac_zlib != xno; then
46- if test "$ZLIB_HAS_PKGCONFIG" = "y" ; then
47- if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then
48- GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib"
49- else
50- GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib"
51- fi
52+ PKG_CHECK_MODULES(ZLIB, zlib)
53+ HAVE_LIBZ=yes
54+ AC_DEFINE([HAVE_LIBZ], [1], [zlib is enabled])
55+ AC_SUBST(HAVE_LIBZ)
56+ LTLIBZ=$ZLIB_LIBS
57+ AC_SUBST(LTLIBZ)
58+ if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then
59+ GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib"
60+ else
61+ GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib"
62 fi
63 fi
64 AC_SUBST(GNUTLS_REQUIRES_PRIVATE)
65--
661.9.1
67
diff --git a/recipes-support/gnutls/gnutls_3.3.27.bb b/recipes-support/gnutls/gnutls_3.3.27.bb
index c98da34..9a8cd40 100644
--- a/recipes-support/gnutls/gnutls_3.3.27.bb
+++ b/recipes-support/gnutls/gnutls_3.3.27.bb
@@ -3,7 +3,7 @@ require recipes-support/gnutls/gnutls.inc
3LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ 3LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
4 file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343" 4 file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343"
5 5
6FILESEXTRAPATHS_prepend = "${COREBASE}/meta/recipes-support/${BPN}/${BPN}:" 6FILESEXTRAPATHS_prepend = "${THISDIR}/${BPN}:${COREBASE}/meta/recipes-support/${BPN}/${BPN}:"
7 7
8SRC_URI += " \ 8SRC_URI += " \
9 file://correct_rpl_gettimeofday_signature.patch \ 9 file://correct_rpl_gettimeofday_signature.patch \