diff options
| -rw-r--r-- | meta/recipes-support/gnutls/gnutls/posix-shell.patch | 39 | ||||
| -rw-r--r-- | meta/recipes-support/gnutls/gnutls_3.6.11.1.bb (renamed from meta/recipes-support/gnutls/gnutls_3.6.8.bb) | 5 |
2 files changed, 2 insertions, 42 deletions
diff --git a/meta/recipes-support/gnutls/gnutls/posix-shell.patch b/meta/recipes-support/gnutls/gnutls/posix-shell.patch deleted file mode 100644 index 938e2d1e18..0000000000 --- a/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/meta/recipes-support/gnutls/gnutls_3.6.8.bb b/meta/recipes-support/gnutls/gnutls_3.6.11.1.bb index c927063f0a..5b05364c25 100644 --- a/meta/recipes-support/gnutls/gnutls_3.6.8.bb +++ b/meta/recipes-support/gnutls/gnutls_3.6.11.1.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] = "3670ee0b0d95b3dee185eff2dc910ee7" +SRC_URI[sha256sum] = "fbba12f3db9a55dbf027e14111755817ec44b57eabec3e8089aac8ac6f533cf8" inherit autotools texinfo pkgconfig gettext lib_package gtk-doc |