From ba7e5f51327d9833776aa066f30c5e46606be374 Mon Sep 17 00:00:00 2001 From: Fan Xin Date: Fri, 9 Jun 2017 15:49:18 +0900 Subject: 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 Signed-off-by: Ross Burton --- .../gnutls/use-pkg-config-to-locate-zlib.patch | 28 ++++++++++++++-------- meta/recipes-support/gnutls/gnutls_3.5.13.bb | 11 +++++++++ meta/recipes-support/gnutls/gnutls_3.5.9.bb | 11 --------- 3 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 meta/recipes-support/gnutls/gnutls_3.5.13.bb delete mode 100644 meta/recipes-support/gnutls/gnutls_3.5.9.bb (limited to 'meta/recipes-support/gnutls') 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 @@ -From cee80af1fe93f5b76765afeebfcc3b902768f5d6 Mon Sep 17 00:00:00 2001 -From: Andre McCurdy -Date: Tue, 26 May 2015 21:41:24 -0700 -Subject: [PATCH] use pkg-config to locate zlib +From 18081068a97c00015aabc5fa321664951458ea0d Mon Sep 17 00:00:00 2001 +From: Fan Xin +Date: Fri, 9 Jun 2017 15:20:31 +0900 +Subject: [PATCH] From cee80af1fe93f5b76765afeebfcc3b902768f5d6 Mon Sep 17 + 00:00:00 2001 From: Andre McCurdy Date: Tue, 26 May + 2015 21:41:24 -0700 Subject: [PATCH] use pkg-config to locate zlib AC_LIB_HAVE_LINKFLAGS can sometimes find host libs and is therefore not robust 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: Upstream-Status: Inappropriate [configuration] Signed-off-by: Andre McCurdy + +Rebase on gnutls 3.5.13 + +Signed-off-by: Fan Xin --- - configure.ac | 24 ++++++++++-------------- - 1 file changed, 10 insertions(+), 14 deletions(-) + configure.ac | 25 +++++++++---------------- + 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac -index 1b561d5..0c787dc 100644 +index c65268e..f6a18aa 100644 --- a/configure.ac +++ b/configure.ac -@@ -508,25 +508,21 @@ AC_ARG_WITH(zlib, AS_HELP_STRING([--without-zlib], +@@ -735,28 +735,21 @@ AC_ARG_WITH(zlib, AS_HELP_STRING([--without-zlib], AC_MSG_CHECKING([whether to include zlib compression support]) if test x$ac_zlib != xno; then AC_MSG_RESULT(yes) @@ -49,6 +55,7 @@ index 1b561d5..0c787dc 100644 - else - GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib" - fi +- LIBZ_PC="" + PKG_CHECK_MODULES(ZLIB, zlib) + HAVE_LIBZ=yes + AC_DEFINE([HAVE_LIBZ], [1], [zlib is enabled]) @@ -57,11 +64,12 @@ index 1b561d5..0c787dc 100644 + AC_SUBST(LTLIBZ) + if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then + GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib" -+ else + else +- LIBZ_PC=$LIBZ + GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib" fi fi - AC_SUBST(GNUTLS_REQUIRES_PRIVATE) + AC_SUBST(LIBZ_PC) -- 1.9.1 diff --git a/meta/recipes-support/gnutls/gnutls_3.5.13.bb b/meta/recipes-support/gnutls/gnutls_3.5.13.bb new file mode 100644 index 0000000000..11155007e5 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls_3.5.13.bb @@ -0,0 +1,11 @@ +require gnutls.inc + +SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \ + file://0001-configure.ac-fix-sed-command.patch \ + file://use-pkg-config-to-locate-zlib.patch \ + file://arm_eabi.patch \ + " +SRC_URI[md5sum] = "4fd41ad86572933c2379b4cc321a0959" +SRC_URI[sha256sum] = "79f5480ad198dad5bc78e075f4a40c4a315a1b2072666919d2d05a08aec13096" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/gnutls/gnutls_3.5.9.bb b/meta/recipes-support/gnutls/gnutls_3.5.9.bb deleted file mode 100644 index 92e58b1737..0000000000 --- a/meta/recipes-support/gnutls/gnutls_3.5.9.bb +++ /dev/null @@ -1,11 +0,0 @@ -require gnutls.inc - -SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \ - file://0001-configure.ac-fix-sed-command.patch \ - file://use-pkg-config-to-locate-zlib.patch \ - file://arm_eabi.patch \ - " -SRC_URI[md5sum] = "0ab25eb6a1509345dd085bc21a387951" -SRC_URI[sha256sum] = "82b10f0c4ef18f4e64ad8cef5dbaf14be732f5095a41cf366b4ecb4050382951" - -BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg