diff options
author | Alex Kiernan <alex.kiernan@gmail.com> | 2019-12-17 05:26:19 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-28 23:25:41 +0000 |
commit | bd738b5e53ecb2b3e4e59c539c7538687cac412d (patch) | |
tree | e82acfaecdcde6912811feedb39eb47da0f6bbc0 /meta/recipes-support/gnutls/gnutls | |
parent | 84c014db704e5110dcd8978297219d528cc1ca1f (diff) | |
download | poky-bd738b5e53ecb2b3e4e59c539c7538687cac412d.tar.gz |
gnutls: upgrade 3.6.8 -> 3.6.11.1
Drop patch from 81485be19b18 ("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>
Diffstat (limited to 'meta/recipes-support/gnutls/gnutls')
-rw-r--r-- | meta/recipes-support/gnutls/gnutls/posix-shell.patch | 39 |
1 files changed, 0 insertions, 39 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 @@ | |||
1 | Don't embed the path to the build-time POSIX shell as this will be | ||
2 | $TMPDIR/hosttools/bash, which is no good on the target. | ||
3 | |||
4 | Instead default to /bin/sh but allow it to be set in the environment. | ||
5 | |||
6 | This isn't really upstreamable but I filed a bug at | ||
7 | https://gitlab.com/gnutls/gnutls/issues/807 and hope a proper fix will be | ||
8 | integrated. | ||
9 | |||
10 | Upstream-Status: Inappropriate | ||
11 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
12 | |||
13 | diff --git a/src/libopts/m4/libopts.m4 b/src/libopts/m4/libopts.m4 | ||
14 | index c6ad738..a62faca 100644 | ||
15 | --- a/src/libopts/m4/libopts.m4 | ||
16 | +++ b/src/libopts/m4/libopts.m4 | ||
17 | @@ -112,21 +112,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[ | ||
18 | AC_CHECK_FUNCS([mmap canonicalize_file_name snprintf strdup strchr \ | ||
19 | strrchr strsignal fchmod fstat chmod]) | ||
20 | AC_PROG_SED | ||
21 | - [while : | ||
22 | - do | ||
23 | - POSIX_SHELL=`which bash` | ||
24 | - test -x "$POSIX_SHELL" && break | ||
25 | - POSIX_SHELL=`which dash` | ||
26 | - test -x "$POSIX_SHELL" && break | ||
27 | - POSIX_SHELL=/usr/xpg4/bin/sh | ||
28 | - test -x "$POSIX_SHELL" && break | ||
29 | - POSIX_SHELL=`/bin/sh -c ' | ||
30 | - exec 2>/dev/null | ||
31 | - if ! true ; then exit 1 ; fi | ||
32 | - echo /bin/sh'` | ||
33 | - test -x "$POSIX_SHELL" && break | ||
34 | - ]AC_MSG_ERROR([cannot locate a working POSIX shell])[ | ||
35 | - done] | ||
36 | + POSIX_SHELL="${POSIX_SHELL:-/bin/sh}" | ||
37 | AC_DEFINE_UNQUOTED([POSIX_SHELL], ["${POSIX_SHELL}"], | ||
38 | [define to a working POSIX compliant shell]) | ||
39 | AC_SUBST([POSIX_SHELL]) | ||