diff options
Diffstat (limited to 'poky/meta/recipes-support/gnutls')
-rw-r--r-- | poky/meta/recipes-support/gnutls/gnutls/posix-shell.patch | 39 | ||||
-rw-r--r-- | poky/meta/recipes-support/gnutls/gnutls_3.6.13.bb (renamed from poky/meta/recipes-support/gnutls/gnutls_3.6.8.bb) | 5 | ||||
-rw-r--r-- | poky/meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch | 38 | ||||
-rw-r--r-- | poky/meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch | 31 | ||||
-rw-r--r-- | poky/meta/recipes-support/gnutls/libtasn1_4.16.0.bb (renamed from poky/meta/recipes-support/gnutls/libtasn1_4.14.bb) | 8 |
5 files changed, 6 insertions, 115 deletions
diff --git a/poky/meta/recipes-support/gnutls/gnutls/posix-shell.patch b/poky/meta/recipes-support/gnutls/gnutls/posix-shell.patch deleted file mode 100644 index 938e2d1e18..0000000000 --- a/poky/meta/recipes-support/gnutls/gnutls/posix-shell.patch +++ /dev/null @@ -1,39 +0,0 @@ -Don't embed the path to the build-time POSIX shell as this will be -$TMPDIR/hosttools/bash, which is no good on the target. - -Instead default to /bin/sh but allow it to be set in the environment. - -This isn't really upstreamable but I filed a bug at -https://gitlab.com/gnutls/gnutls/issues/807 and hope a proper fix will be -integrated. - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/src/libopts/m4/libopts.m4 b/src/libopts/m4/libopts.m4 -index c6ad738..a62faca 100644 ---- a/src/libopts/m4/libopts.m4 -+++ b/src/libopts/m4/libopts.m4 -@@ -112,21 +112,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[ - AC_CHECK_FUNCS([mmap canonicalize_file_name snprintf strdup strchr \ - strrchr strsignal fchmod fstat chmod]) - AC_PROG_SED -- [while : -- do -- POSIX_SHELL=`which bash` -- test -x "$POSIX_SHELL" && break -- POSIX_SHELL=`which dash` -- test -x "$POSIX_SHELL" && break -- POSIX_SHELL=/usr/xpg4/bin/sh -- test -x "$POSIX_SHELL" && break -- POSIX_SHELL=`/bin/sh -c ' -- exec 2>/dev/null -- if ! true ; then exit 1 ; fi -- echo /bin/sh'` -- test -x "$POSIX_SHELL" && break -- ]AC_MSG_ERROR([cannot locate a working POSIX shell])[ -- done] -+ POSIX_SHELL="${POSIX_SHELL:-/bin/sh}" - AC_DEFINE_UNQUOTED([POSIX_SHELL], ["${POSIX_SHELL}"], - [define to a working POSIX compliant shell]) - AC_SUBST([POSIX_SHELL]) diff --git a/poky/meta/recipes-support/gnutls/gnutls_3.6.8.bb b/poky/meta/recipes-support/gnutls/gnutls_3.6.13.bb index c927063f0a..f56d42a613 100644 --- a/poky/meta/recipes-support/gnutls/gnutls_3.6.8.bb +++ b/poky/meta/recipes-support/gnutls/gnutls_3.6.13.bb @@ -19,11 +19,10 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \ file://arm_eabi.patch \ - file://posix-shell.patch \ " -SRC_URI[md5sum] = "9dcf0aa45d1a42e1b3ca5d39ec7c61a8" -SRC_URI[sha256sum] = "aa81944e5635de981171772857e72be231a7e0f559ae0292d2737de475383e83" +SRC_URI[md5sum] = "bb1fe696a11543433785b4fc70ca225f" +SRC_URI[sha256sum] = "32041df447d9f4644570cf573c9f60358e865637d69b7e59d1159b7240b52f38" inherit autotools texinfo pkgconfig gettext lib_package gtk-doc diff --git a/poky/meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch b/poky/meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch deleted file mode 100644 index bfc9b9fca7..0000000000 --- a/poky/meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch +++ /dev/null @@ -1,38 +0,0 @@ -Upstream-Status: Backport [https://gitlab.com/gnutls/libtasn1/merge_requests/49] -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From ebd4f871b5241809f6a5b461444a6d331e15c949 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Mon, 9 Sep 2019 13:11:39 +0100 -Subject: [PATCH] doc/reference: don't add empty object hierarchy chapter - -The object hierarchy section is empty because there are no GObjects in the -libtasn1 API. With gtk-doc 1.30 onwards if there are no objects then the object -hierarchy file won't exist, resulting in a failure when building the -documentation: - -| ../libtasn1-docs.xml:39: element include: XInclude error : could not load ../xml/tree_index.sgml, and no fallback was found - -Signed-off-by: Ross Burton <ross.burton@intel.com> ---- - doc/reference/libtasn1-docs.xml | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/doc/reference/libtasn1-docs.xml b/doc/reference/libtasn1-docs.xml -index accdb85..f88b888 100644 ---- a/doc/reference/libtasn1-docs.xml -+++ b/doc/reference/libtasn1-docs.xml -@@ -34,10 +34,6 @@ - <xi:include href="xml/libtasn1.xml"/> - - </chapter> -- <chapter id="object-tree"> -- <title>Object Hierarchy</title> -- <xi:include href="xml/tree_index.sgml"/> -- </chapter> - <index id="api-index-full"> - <title>API Index</title> - <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include> --- -2.20.1 - diff --git a/poky/meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch b/poky/meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch deleted file mode 100644 index f18f3c6267..0000000000 --- a/poky/meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a6f93b7ace347bc4fe29eb4a8fe4383d786cc8d0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de> -Date: Tue, 23 Jul 2019 20:44:01 +0200 -Subject: [PATCH] Fix LDFLAGS to AM_LDFLAGS in src/Makefile.am -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de> -Upstream-Status: Backport -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 5bf3622..4459767 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -21,7 +21,7 @@ AM_CPPFLAGS = -I$(top_builddir)/lib/includes -I$(top_srcdir)/lib/includes \ - -I$(top_builddir)/lib/gl -I$(top_srcdir)/lib/gl $(CODE_COVERAGE_CPPFLAGS) - - LDADD = ../lib/libtasn1.la --LDFLAGS = $(CODE_COVERAGE_LDFLAGS) -+AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS) - - bin_PROGRAMS = asn1Parser asn1Coding asn1Decoding - --- -2.21.0 - diff --git a/poky/meta/recipes-support/gnutls/libtasn1_4.14.bb b/poky/meta/recipes-support/gnutls/libtasn1_4.16.0.bb index ef2c1956a2..8337b70241 100644 --- a/poky/meta/recipes-support/gnutls/libtasn1_4.14.bb +++ b/poky/meta/recipes-support/gnutls/libtasn1_4.16.0.bb @@ -10,15 +10,15 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ file://dont-depend-on-help2man.patch \ - file://fix-ldflags.patch \ - file://fix-gtkdoc.patch \ " DEPENDS = "bison-native" -SRC_URI[md5sum] = "e9918200ed4a778e2b3cbe34c1be4205" -SRC_URI[sha256sum] = "9e604ba5c5c8ea403487695c2e407405820d98540d9de884d6e844f9a9c5ba08" +SRC_URI[md5sum] = "531208de3729d42e2af0a32890f08736" +SRC_URI[sha256sum] = "0e0fb0903839117cb6e3b56e68222771bebf22ad7fc2295a0ed7d576e8d4329d" inherit autotools texinfo lib_package gtk-doc +CFLAGS_append_class-native = " -std=gnu99" + BBCLASSEXTEND = "native nativesdk" |