diff options
author | Armin Kuster <akuster808@gmail.com> | 2017-11-21 12:01:32 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-02 11:25:32 +0000 |
commit | 452fa2df2f2d12e8675925cb04dc4ad9311667a1 (patch) | |
tree | 2b73cf9da8ef7bc433ae3f43af0028c4e74e52e2 /meta/recipes-support/gnutls/gnutls | |
parent | a52a7c33472b73e7c55ba0ffc56f4e87ad61931f (diff) | |
download | poky-452fa2df2f2d12e8675925cb04dc4ad9311667a1.tar.gz |
gnutls: update to 3.6.1
zlib configure.ac support removed in 3.6.1
drop patch
(From OE-Core rev: 537325f204f2f7c66f13a12dc8fc08f8e16e4754)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gnutls/gnutls')
-rw-r--r-- | meta/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/meta/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch b/meta/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch deleted file mode 100644 index ae141a5bcd..0000000000 --- a/meta/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch +++ /dev/null | |||
@@ -1,75 +0,0 @@ | |||
1 | From 18081068a97c00015aabc5fa321664951458ea0d Mon Sep 17 00:00:00 2001 | ||
2 | From: Fan Xin <fan.xin@jp.fujitsu.com> | ||
3 | Date: Fri, 9 Jun 2017 15:20:31 +0900 | ||
4 | Subject: [PATCH] From cee80af1fe93f5b76765afeebfcc3b902768f5d6 Mon Sep 17 | ||
5 | 00:00:00 2001 From: Andre McCurdy <armccurdy@gmail.com> Date: Tue, 26 May | ||
6 | 2015 21:41:24 -0700 Subject: [PATCH] use pkg-config to locate zlib | ||
7 | |||
8 | AC_LIB_HAVE_LINKFLAGS can sometimes find host libs and is therefore not | ||
9 | robust when cross-compiling. Remove it for zlib and use PKG_CHECK_MODULES | ||
10 | instead. | ||
11 | |||
12 | Removing AC_LIB_HAVE_LINKFLAGS for zlib also removes the --with-libz-prefix | ||
13 | configure option. If zlib support is enabled, then failure to find zlib via | ||
14 | pkg-config is now treated as a fatal error. | ||
15 | |||
16 | Change based on ChromeOS gnutls 2.12.23 cross-compile fixes patch: | ||
17 | |||
18 | https://chromium-review.googlesource.com/#/c/271661/ | ||
19 | |||
20 | Upstream-Status: Inappropriate [configuration] | ||
21 | |||
22 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | ||
23 | |||
24 | Rebase on gnutls 3.5.13 | ||
25 | |||
26 | Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> | ||
27 | --- | ||
28 | configure.ac | 25 +++++++++---------------- | ||
29 | 1 file changed, 9 insertions(+), 16 deletions(-) | ||
30 | |||
31 | diff --git a/configure.ac b/configure.ac | ||
32 | index c65268e..f6a18aa 100644 | ||
33 | --- a/configure.ac | ||
34 | +++ b/configure.ac | ||
35 | @@ -735,28 +735,21 @@ AC_ARG_WITH(zlib, AS_HELP_STRING([--without-zlib], | ||
36 | AC_MSG_CHECKING([whether to include zlib compression support]) | ||
37 | if test x$ac_zlib != xno; then | ||
38 | AC_MSG_RESULT(yes) | ||
39 | - AC_LIB_HAVE_LINKFLAGS(z,, [#include <zlib.h>], [compress (0, 0, 0, 0);]) | ||
40 | - if test x$ac_cv_libz != xyes; then | ||
41 | - AC_MSG_WARN( | ||
42 | -*** | ||
43 | -*** ZLIB was not found. You will not be able to use ZLIB compression.) | ||
44 | - fi | ||
45 | else | ||
46 | AC_MSG_RESULT(no) | ||
47 | fi | ||
48 | |||
49 | -PKG_CHECK_EXISTS(zlib, ZLIB_HAS_PKGCONFIG=y, ZLIB_HAS_PKGCONFIG=n) | ||
50 | - | ||
51 | if test x$ac_zlib != xno; then | ||
52 | - if test "$ZLIB_HAS_PKGCONFIG" = "y" ; then | ||
53 | - if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then | ||
54 | - GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib" | ||
55 | - else | ||
56 | - GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib" | ||
57 | - fi | ||
58 | - LIBZ_PC="" | ||
59 | + PKG_CHECK_MODULES(ZLIB, zlib) | ||
60 | + HAVE_LIBZ=yes | ||
61 | + AC_DEFINE([HAVE_LIBZ], [1], [zlib is enabled]) | ||
62 | + AC_SUBST(HAVE_LIBZ) | ||
63 | + LTLIBZ=$ZLIB_LIBS | ||
64 | + AC_SUBST(LTLIBZ) | ||
65 | + if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then | ||
66 | + GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib" | ||
67 | else | ||
68 | - LIBZ_PC=$LIBZ | ||
69 | + GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib" | ||
70 | fi | ||
71 | fi | ||
72 | AC_SUBST(LIBZ_PC) | ||
73 | -- | ||
74 | 1.9.1 | ||
75 | |||