summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorFan Xin <fan.xin@jp.fujitsu.com>2017-06-09 15:49:18 +0900
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-12 15:08:31 +0100
commit5c9acfbeaa67b3d85e7bb9fd46be445ea179c2fa (patch)
treef16642effb2248614a423670a803f7cc9927b7a3 /meta/recipes-support
parentf1a5c7c53be36bbee3b7476b336bab5a04c2d46d (diff)
downloadpoky-5c9acfbeaa67b3d85e7bb9fd46be445ea179c2fa.tar.gz
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 (From OE-Core rev: ba7e5f51327d9833776aa066f30c5e46606be374) Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.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')
-rw-r--r--meta/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch28
-rw-r--r--meta/recipes-support/gnutls/gnutls_3.5.13.bb (renamed from meta/recipes-support/gnutls/gnutls_3.5.9.bb)4
2 files changed, 20 insertions, 12 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
index 0e1b7c8f72..ae141a5bcd 100644
--- 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
@@ -1,7 +1,9 @@
1From cee80af1fe93f5b76765afeebfcc3b902768f5d6 Mon Sep 17 00:00:00 2001 1From 18081068a97c00015aabc5fa321664951458ea0d Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com> 2From: Fan Xin <fan.xin@jp.fujitsu.com>
3Date: Tue, 26 May 2015 21:41:24 -0700 3Date: Fri, 9 Jun 2017 15:20:31 +0900
4Subject: [PATCH] use pkg-config to locate zlib 4Subject: [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
5 7
6AC_LIB_HAVE_LINKFLAGS can sometimes find host libs and is therefore not 8AC_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 9robust when cross-compiling. Remove it for zlib and use PKG_CHECK_MODULES
@@ -18,15 +20,19 @@ Change based on ChromeOS gnutls 2.12.23 cross-compile fixes patch:
18Upstream-Status: Inappropriate [configuration] 20Upstream-Status: Inappropriate [configuration]
19 21
20Signed-off-by: Andre McCurdy <armccurdy@gmail.com> 22Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
23
24Rebase on gnutls 3.5.13
25
26Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
21--- 27---
22 configure.ac | 24 ++++++++++-------------- 28 configure.ac | 25 +++++++++----------------
23 1 file changed, 10 insertions(+), 14 deletions(-) 29 1 file changed, 9 insertions(+), 16 deletions(-)
24 30
25diff --git a/configure.ac b/configure.ac 31diff --git a/configure.ac b/configure.ac
26index 1b561d5..0c787dc 100644 32index c65268e..f6a18aa 100644
27--- a/configure.ac 33--- a/configure.ac
28+++ b/configure.ac 34+++ b/configure.ac
29@@ -508,25 +508,21 @@ AC_ARG_WITH(zlib, AS_HELP_STRING([--without-zlib], 35@@ -735,28 +735,21 @@ AC_ARG_WITH(zlib, AS_HELP_STRING([--without-zlib],
30 AC_MSG_CHECKING([whether to include zlib compression support]) 36 AC_MSG_CHECKING([whether to include zlib compression support])
31 if test x$ac_zlib != xno; then 37 if test x$ac_zlib != xno; then
32 AC_MSG_RESULT(yes) 38 AC_MSG_RESULT(yes)
@@ -49,6 +55,7 @@ index 1b561d5..0c787dc 100644
49- else 55- else
50- GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib" 56- GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib"
51- fi 57- fi
58- LIBZ_PC=""
52+ PKG_CHECK_MODULES(ZLIB, zlib) 59+ PKG_CHECK_MODULES(ZLIB, zlib)
53+ HAVE_LIBZ=yes 60+ HAVE_LIBZ=yes
54+ AC_DEFINE([HAVE_LIBZ], [1], [zlib is enabled]) 61+ AC_DEFINE([HAVE_LIBZ], [1], [zlib is enabled])
@@ -57,11 +64,12 @@ index 1b561d5..0c787dc 100644
57+ AC_SUBST(LTLIBZ) 64+ AC_SUBST(LTLIBZ)
58+ if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then 65+ if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then
59+ GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib" 66+ GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib"
60+ else 67 else
68- LIBZ_PC=$LIBZ
61+ GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib" 69+ GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib"
62 fi 70 fi
63 fi 71 fi
64 AC_SUBST(GNUTLS_REQUIRES_PRIVATE) 72 AC_SUBST(LIBZ_PC)
65-- 73--
661.9.1 741.9.1
67 75
diff --git a/meta/recipes-support/gnutls/gnutls_3.5.9.bb b/meta/recipes-support/gnutls/gnutls_3.5.13.bb
index 92e58b1737..11155007e5 100644
--- a/meta/recipes-support/gnutls/gnutls_3.5.9.bb
+++ b/meta/recipes-support/gnutls/gnutls_3.5.13.bb
@@ -5,7 +5,7 @@ SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \
5 file://use-pkg-config-to-locate-zlib.patch \ 5 file://use-pkg-config-to-locate-zlib.patch \
6 file://arm_eabi.patch \ 6 file://arm_eabi.patch \
7 " 7 "
8SRC_URI[md5sum] = "0ab25eb6a1509345dd085bc21a387951" 8SRC_URI[md5sum] = "4fd41ad86572933c2379b4cc321a0959"
9SRC_URI[sha256sum] = "82b10f0c4ef18f4e64ad8cef5dbaf14be732f5095a41cf366b4ecb4050382951" 9SRC_URI[sha256sum] = "79f5480ad198dad5bc78e075f4a40c4a315a1b2072666919d2d05a08aec13096"
10 10
11BBCLASSEXTEND = "native nativesdk" 11BBCLASSEXTEND = "native nativesdk"