mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 12:29:55 +00:00
gnutls: upgrade 3.6.8 -> 3.6.11.1
Drop patch from 81485be19b ("gnutls: don't use HOSTTOOLS_DIR/bash as a
shell on target") as upstream now honours POSIX_SHELL when set as the
primary target shell.
(From OE-Core rev: bc487ced3be40569157fb40c99bfa68871f74744)
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
84c014db70
commit
bd738b5e53
@@ -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])
|
|
||||||
+2
-3
@@ -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 \
|
SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \
|
||||||
file://arm_eabi.patch \
|
file://arm_eabi.patch \
|
||||||
file://posix-shell.patch \
|
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "9dcf0aa45d1a42e1b3ca5d39ec7c61a8"
|
SRC_URI[md5sum] = "3670ee0b0d95b3dee185eff2dc910ee7"
|
||||||
SRC_URI[sha256sum] = "aa81944e5635de981171772857e72be231a7e0f559ae0292d2737de475383e83"
|
SRC_URI[sha256sum] = "fbba12f3db9a55dbf027e14111755817ec44b57eabec3e8089aac8ac6f533cf8"
|
||||||
|
|
||||||
inherit autotools texinfo pkgconfig gettext lib_package gtk-doc
|
inherit autotools texinfo pkgconfig gettext lib_package gtk-doc
|
||||||
|
|
||||||
Reference in New Issue
Block a user