diff options
Diffstat (limited to 'meta/recipes-extended/bash/bash')
-rw-r--r-- | meta/recipes-extended/bash/bash/build-tests.patch | 55 | ||||
-rw-r--r-- | meta/recipes-extended/bash/bash/execute_cmd.patch | 17 | ||||
-rw-r--r-- | meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch | 26 | ||||
-rw-r--r-- | meta/recipes-extended/bash/bash/run-ptest | 2 | ||||
-rw-r--r-- | meta/recipes-extended/bash/bash/test-output.patch | 25 |
5 files changed, 125 insertions, 0 deletions
diff --git a/meta/recipes-extended/bash/bash/build-tests.patch b/meta/recipes-extended/bash/bash/build-tests.patch new file mode 100644 index 0000000000..73a81b60da --- /dev/null +++ b/meta/recipes-extended/bash/bash/build-tests.patch | |||
@@ -0,0 +1,55 @@ | |||
1 | Add 'ptest' target to Makefile, to run tests without checking dependencies. | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | Signed-off-by: Anders Roxell <anders.roxell@enea.com> | ||
5 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
6 | --- | ||
7 | Makefile.in | 24 +++++++++++++++++++----- | ||
8 | 1 file changed, 19 insertions(+), 5 deletions(-) | ||
9 | |||
10 | diff --git a/Makefile.in b/Makefile.in | ||
11 | --- a/Makefile.in | ||
12 | +++ b/Makefile.in | ||
13 | @@ -848,20 +848,34 @@ maybe-clean: | ||
14 | fi | ||
15 | |||
16 | recho$(EXEEXT): $(SUPPORT_SRC)recho.c | ||
17 | - @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) ${LDFLAGS_FOR_BUILD} -o $@ $(SUPPORT_SRC)recho.c ${LIBS_FOR_BUILD} | ||
18 | + @$(CC) $(CCFLAGS) ${LDFLAGS} -o $@ $< | ||
19 | |||
20 | zecho$(EXEEXT): $(SUPPORT_SRC)zecho.c | ||
21 | - @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) ${LDFLAGS_FOR_BUILD} -o $@ $(SUPPORT_SRC)zecho.c ${LIBS_FOR_BUILD} | ||
22 | + @$(CC) $(CCFLAGS) ${LDFLAGS} -o $@ $< | ||
23 | |||
24 | printenv$(EXEEXT): $(SUPPORT_SRC)printenv.c | ||
25 | - @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) ${LDFLAGS_FOR_BUILD} -o $@ $(SUPPORT_SRC)printenv.c ${LIBS_FOR_BUILD} | ||
26 | + @$(CC) $(CCFLAGS) ${LDFLAGS} -o $@ $< | ||
27 | |||
28 | xcase$(EXEEXT): $(SUPPORT_SRC)xcase.c | ||
29 | - @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) ${LDFLAGS_FOR_BUILD} -o $@ $(SUPPORT_SRC)xcase.c ${LIBS_FOR_BUILD} | ||
30 | + @$(CC) $(CCFLAGS) ${LDFLAGS} -o $@ $< | ||
31 | |||
32 | -test tests check: force $(Program) $(TESTS_SUPPORT) | ||
33 | +test tests check: | ||
34 | + @$(MAKE) install-test | ||
35 | + @$(MAKE) runtest | ||
36 | + | ||
37 | +install-test: buildtest | ||
38 | +ifeq ($(origin INSTALL_TEST_DIR), undefined) | ||
39 | @-test -d tests || mkdir tests | ||
40 | @cp $(TESTS_SUPPORT) tests | ||
41 | +else | ||
42 | + @-test -d $(INSTALL_TEST_DIR) || mkdir -p $(INSTALL_TEST_DIR) | ||
43 | + @cp -r $(srcdir)/tests/* $(INSTALL_TEST_DIR)/ | ||
44 | + @cp $(TESTS_SUPPORT) $(INSTALL_TEST_DIR) | ||
45 | +endif | ||
46 | + | ||
47 | +buildtest: force $(Program) $(TESTS_SUPPORT) | ||
48 | + | ||
49 | +runtest: | ||
50 | @( cd $(srcdir)/tests && \ | ||
51 | PATH=$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} ) | ||
52 | |||
53 | -- | ||
54 | 1.8.1.2 | ||
55 | |||
diff --git a/meta/recipes-extended/bash/bash/execute_cmd.patch b/meta/recipes-extended/bash/bash/execute_cmd.patch new file mode 100644 index 0000000000..81f8f0a9cd --- /dev/null +++ b/meta/recipes-extended/bash/bash/execute_cmd.patch | |||
@@ -0,0 +1,17 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | --- execute_cmd.c.orig Fri Jun 3 13:34:42 2011 | ||
4 | +++ execute_cmd.c Fri Jun 3 13:36:41 2011 | ||
5 | @@ -2202,7 +2202,11 @@ | ||
6 | /* If the `lastpipe' option is set with shopt, and job control is not | ||
7 | enabled, execute the last element of non-async pipelines in the | ||
8 | current shell environment. */ | ||
9 | - if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) | ||
10 | + if (lastpipe_opt && | ||
11 | +#if defined(JOB_CONTROL) | ||
12 | + job_control == 0 && | ||
13 | +#endif | ||
14 | + asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) | ||
15 | { | ||
16 | lstdin = move_to_high_fd (0, 0, 255); | ||
17 | if (lstdin > 0) | ||
diff --git a/meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch b/meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch new file mode 100644 index 0000000000..a9391d6cac --- /dev/null +++ b/meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | On hosts with FORTIFY_SOURCES, stringize support is required, as it's used by | ||
2 | the macros to wrap functions (e.g. read and open in unistd.h). Those wrappers | ||
3 | use the STRING() macro from unistd.h. A header in the bash sources overrides | ||
4 | the unistd.h macro to 'x' when HAVE_STRINGIZE is not defined, causing the | ||
5 | wrappers to generate calls to 'xread' and 'xopen', which do not exist, | ||
6 | resulting in a failure to link. | ||
7 | |||
8 | Assume we have stringize support when cross-compiling, which works around the | ||
9 | issue. | ||
10 | |||
11 | It may be best for upstream to either give up on supporting compilers without | ||
12 | stringize support, or to not define STRING() at all when FORTIFY_SOURCES is | ||
13 | defined, letting the unistd.h one be used, instead. | ||
14 | |||
15 | Upstream-Status: Pending | ||
16 | |||
17 | --- bash-4.2.orig/builtins/mkbuiltins.c | ||
18 | +++ bash-4.2/builtins/mkbuiltins.c | ||
19 | @@ -28,6 +28,7 @@ | ||
20 | # define HAVE_STDLIB_H | ||
21 | |||
22 | # define HAVE_RENAME | ||
23 | +# define HAVE_STRINGIZE | ||
24 | #endif /* CROSS_COMPILING */ | ||
25 | |||
26 | #if defined (HAVE_UNISTD_H) | ||
diff --git a/meta/recipes-extended/bash/bash/run-ptest b/meta/recipes-extended/bash/bash/run-ptest new file mode 100644 index 0000000000..8dd3b9981d --- /dev/null +++ b/meta/recipes-extended/bash/bash/run-ptest | |||
@@ -0,0 +1,2 @@ | |||
1 | #!/bin/sh | ||
2 | make -k THIS_SH=/bin/bash BUILD_DIR=. runtest | ||
diff --git a/meta/recipes-extended/bash/bash/test-output.patch b/meta/recipes-extended/bash/bash/test-output.patch new file mode 100644 index 0000000000..2b09b7d977 --- /dev/null +++ b/meta/recipes-extended/bash/bash/test-output.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | Add FAIL/PASS output to test output. | ||
2 | |||
3 | Signed-off-by: Björn Stenberg <bjst@enea.com> | ||
4 | Upstream-Status: Pending | ||
5 | --- | ||
6 | diff -uNr a/tests/run-all b/tests/run-all | ||
7 | --- a/tests/run-all 1999-10-08 17:07:46.000000000 +0200 | ||
8 | +++ b/tests/run-all 2012-10-27 21:04:18.663331887 +0200 | ||
9 | @@ -22,7 +22,15 @@ | ||
10 | case $x in | ||
11 | $0|run-minimal|run-gprof) ;; | ||
12 | *.orig|*~) ;; | ||
13 | - *) echo $x ; sh $x ;; | ||
14 | + *) echo $x | ||
15 | + output=`sh $x` | ||
16 | + if [ -n "$output" ]; then | ||
17 | + echo "$output" | ||
18 | + echo "FAIL: $x" | ||
19 | + else | ||
20 | + echo "PASS: $x" | ||
21 | + fi | ||
22 | + ;; | ||
23 | esac | ||
24 | done | ||
25 | |||