diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-12-15 14:48:02 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-17 09:56:43 +0000 |
| commit | 84c6a3bcf44950049bba255075177a0004058a44 (patch) | |
| tree | 83a605cf873666dfa4dc40f1420f1ab91ef3f71c /meta | |
| parent | 7c5462f5ff3303da8d7daa5f22827bd852987138 (diff) | |
| download | openembedded-core-84c6a3bcf44950049bba255075177a0004058a44.tar.gz openembedded-core-84c6a3bcf44950049bba255075177a0004058a44.tar.bz2 openembedded-core-84c6a3bcf44950049bba255075177a0004058a44.zip | |
gnutls: update to 3.5.7
Add a 0001-Do-not-add-cli-args.h-to-cli-args.stamp-Makefile-tar.patch
to fix a compile issue (incorrect creation of an empty header).
Add a libunistring dependency as gnutls has gained it.
(From OE-Core rev: b2ec343ad770c26f39f3a6d335e4bb3ccbf41aec)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
5 files changed, 44 insertions, 15 deletions
diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc index 4a5c3dfebf..184a50f6e1 100644 --- a/meta/recipes-support/gnutls/gnutls.inc +++ b/meta/recipes-support/gnutls/gnutls.inc @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283 \ file://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://doc/COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343" -DEPENDS = "nettle gmp virtual/libiconv" +DEPENDS = "nettle gmp virtual/libiconv libunistring" DEPENDS_append_libc-musl = " argp-standalone" SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" diff --git a/meta/recipes-support/gnutls/gnutls/0001-Do-not-add-cli-args.h-to-cli-args.stamp-Makefile-tar.patch b/meta/recipes-support/gnutls/gnutls/0001-Do-not-add-cli-args.h-to-cli-args.stamp-Makefile-tar.patch new file mode 100644 index 0000000000..099081022d --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/0001-Do-not-add-cli-args.h-to-cli-args.stamp-Makefile-tar.patch @@ -0,0 +1,27 @@ +From 68ef47ab3472472780939671731c295481b5535f Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 14 Dec 2016 17:42:45 +0200 +Subject: [PATCH] Do not add cli-args.h to cli-args.stamp Makefile target + +Upstream-Status: Submitted [https://gitlab.com/gnutls/gnutls/issues/155] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 49d3af3..827638e 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -261,7 +261,7 @@ cli-debug-args.stamp: $(srcdir)/cli-debug-args.def $(srcdir)/args-std.def + + cli-args.h: cli-args.stamp + cli-args.c: cli-args.stamp +-cli-args.stamp cli-args.h: $(srcdir)/cli-args.def $(srcdir)/args-std.def ++cli-args.stamp: $(srcdir)/cli-args.def $(srcdir)/args-std.def + -$(AUTOGEN) $< + touch $@ + +-- +2.10.2 + diff --git a/meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch b/meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch index 5e452c52e7..96b023a468 100644 --- a/meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch +++ b/meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch @@ -1,7 +1,7 @@ -From ae3370788ed3447bba16969d9eb1bf1b9631e1b7 Mon Sep 17 00:00:00 2001 +From 81b0f04c14f673b99778d2e7d8e85461e0bf2018 Mon Sep 17 00:00:00 2001 From: Valentin Popa <valentin.popa@intel.com> Date: Fri, 25 Apr 2014 13:58:55 +0300 -Subject: [PATCH] Correct rpl_gettimeofday signature +Subject: [PATCH 1/3] Correct rpl_gettimeofday signature Currently we fail on uclibc like below @@ -29,12 +29,13 @@ eglibc otherwise we will have same issue there too Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending + --- gl/sys_time.in.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gl/sys_time.in.h b/gl/sys_time.in.h -index 84a17c9..6ceadc3 100644 +index 5a8caf3..2dc5718 100644 --- a/gl/sys_time.in.h +++ b/gl/sys_time.in.h @@ -93,20 +93,20 @@ struct timeval @@ -61,7 +62,7 @@ index 84a17c9..6ceadc3 100644 + (struct timeval *__restrict, void *__restrict)); # endif _GL_CXXALIASWARN (gettimeofday); - #elif defined GNULIB_POSIXCHECK + # if defined __cplusplus && defined GNULIB_NAMESPACE -- -1.9.1 +2.10.2 diff --git a/meta/recipes-support/gnutls/gnutls_3.5.6.bb b/meta/recipes-support/gnutls/gnutls_3.5.6.bb deleted file mode 100644 index 2e70734a2a..0000000000 --- a/meta/recipes-support/gnutls/gnutls_3.5.6.bb +++ /dev/null @@ -1,9 +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 \ - " -SRC_URI[md5sum] = "7a38b23757aae009c3eb5bb12fb0afda" -SRC_URI[sha256sum] = "6338b715bf31c758606ffa489c7f87ee1beab947114fbd2ffefd73170a8c6b9a" - diff --git a/meta/recipes-support/gnutls/gnutls_3.5.7.bb b/meta/recipes-support/gnutls/gnutls_3.5.7.bb new file mode 100644 index 0000000000..cf77a20634 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls_3.5.7.bb @@ -0,0 +1,10 @@ +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://0001-Do-not-add-cli-args.h-to-cli-args.stamp-Makefile-tar.patch \ + " +SRC_URI[md5sum] = "08ad2c539bc1d91283f610539deef34e" +SRC_URI[sha256sum] = "60cbfc119e6268cfa38d712621daa473298a0c5b129c0842caec4c1ed4d7861a" + |