summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/autoconf/autoconf/preferbash.patch23
-rw-r--r--meta/recipes-devtools/autoconf/autoconf_2.69.bb1
2 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-devtools/autoconf/autoconf/preferbash.patch b/meta/recipes-devtools/autoconf/autoconf/preferbash.patch
new file mode 100644
index 0000000000..41a623ac56
--- /dev/null
+++ b/meta/recipes-devtools/autoconf/autoconf/preferbash.patch
@@ -0,0 +1,23 @@
1This value is used to determine CONFIG_SHELL and SHELL which may get exported into
2scripts shared via sstate onto other systems.
3
4Some systems have /bin/sh -> dash and others /bin/sh -> bash. Bash is preferred
5but sometimes we can sometimes end up exporting /bin/sh yet use bashisms.
6
7This patch puts bash first in the search results which avoids the bash/dash confusion.
8
9RP 2012/9/23
10
11Index: autoconf-2.69/lib/m4sugar/m4sh.m4
12===================================================================
13--- autoconf-2.69.orig/lib/m4sugar/m4sh.m4 2012-03-07 17:35:26.000000000 +0000
14+++ autoconf-2.69/lib/m4sugar/m4sh.m4 2013-09-23 16:12:38.853597515 +0000
15@@ -229,7 +229,7 @@
16 [_AS_PATH_WALK([/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH],
17 [case $as_dir in @%:@(
18 /*)
19- for as_base in sh bash ksh sh5; do
20+ for as_base in bash sh ksh sh5; do
21 # Try only shells that exist, to save several forks.
22 as_shell=$as_dir/$as_base
23 AS_IF([{ test -f "$as_shell" || test -f "$as_shell.exe"; } &&
diff --git a/meta/recipes-devtools/autoconf/autoconf_2.69.bb b/meta/recipes-devtools/autoconf/autoconf_2.69.bb
index 75129512cc..15227299d4 100644
--- a/meta/recipes-devtools/autoconf/autoconf_2.69.bb
+++ b/meta/recipes-devtools/autoconf/autoconf_2.69.bb
@@ -16,6 +16,7 @@ SRC_URI += "file://autoreconf-include.patch \
16 ${@['file://path_prog_fixes.patch', ''][bb.data.inherits_class('native', d) or bb.data.inherits_class('nativesdk', d)]} \ 16 ${@['file://path_prog_fixes.patch', ''][bb.data.inherits_class('native', d) or bb.data.inherits_class('nativesdk', d)]} \
17 file://config_site.patch \ 17 file://config_site.patch \
18 file://remove-usr-local-lib-from-m4.patch \ 18 file://remove-usr-local-lib-from-m4.patch \
19 file://preferbash.patch \
19 " 20 "
20 21
21SRC_URI[md5sum] = "82d05e03b93e45f5a39b828dc9c6c29b" 22SRC_URI[md5sum] = "82d05e03b93e45f5a39b828dc9c6c29b"