diff options
Diffstat (limited to 'meta/recipes-extended/bash')
7 files changed, 0 insertions, 172 deletions
diff --git a/meta/recipes-extended/bash/bash-3.2.57/build-tests.patch b/meta/recipes-extended/bash/bash-3.2.57/build-tests.patch deleted file mode 100644 index e63457cf2b..0000000000 --- a/meta/recipes-extended/bash/bash-3.2.57/build-tests.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | Add 'ptest' target to Makefile, to run tests without checking dependencies. | ||
2 | |||
3 | Signed-off-by: Anders Roxell <anders.roxell@enea.com> | ||
4 | Upstream-Status: Pending | ||
5 | --- | ||
6 | diff -dNaur bash-3.2.48/Makefile.in.orig bash-3.2.48/Makefile.in | ||
7 | --- bash-3.2.48/Makefile.in.orig 2006-08-17 23:03:35.000000000 +0500 | ||
8 | +++ bash-3.2.48/Makefile.in 2013-07-02 20:20:07.512709327 +0500 | ||
9 | @@ -803,17 +803,31 @@ | ||
10 | fi | ||
11 | |||
12 | recho$(EXEEXT): $(SUPPORT_SRC)recho.c | ||
13 | - @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) -o $@ $(SUPPORT_SRC)recho.c ${LIBS_FOR_BUILD} | ||
14 | + @$(CC) $(CCFLAGS) $(LDFLAGS) -o $@ $< | ||
15 | |||
16 | zecho$(EXEEXT): $(SUPPORT_SRC)zecho.c | ||
17 | - @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) -o $@ $(SUPPORT_SRC)zecho.c ${LIBS_FOR_BUILD} | ||
18 | + @$(CC) $(CCFLAGS) $(LDFLAGS) -o $@ $< | ||
19 | |||
20 | printenv$(EXEEXT): $(SUPPORT_SRC)printenv.c | ||
21 | - @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) -o $@ $(SUPPORT_SRC)printenv.c ${LIBS_FOR_BUILD} | ||
22 | + @$(CC) $(CCFLAGS) $(LDFLAGS) -o $@ $< | ||
23 | |||
24 | -test tests check: force $(Program) $(TESTS_SUPPORT) | ||
25 | +test tests check: | ||
26 | + @$(MAKE) install-test | ||
27 | + @$(MAKE) runtest | ||
28 | + | ||
29 | +install-test: buildtest | ||
30 | +ifeq ($(origin INSTALL_TEST_DIR), undefined) | ||
31 | @-test -d tests || mkdir tests | ||
32 | @cp $(TESTS_SUPPORT) tests | ||
33 | +else | ||
34 | + @-test -d $(INSTALL_TEST_DIR) || mkdir -p $(INSTALL_TEST_DIR) | ||
35 | + @cp -r $(srcdir)/tests/* $(INSTALL_TEST_DIR)/ | ||
36 | + @cp $(TESTS_SUPPORT) $(INSTALL_TEST_DIR) | ||
37 | +endif | ||
38 | + | ||
39 | +buildtest: force $(Program) $(TESTS_SUPPORT) | ||
40 | + | ||
41 | +runtest: | ||
42 | @( cd $(srcdir)/tests && \ | ||
43 | PATH=$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} ) | ||
44 | |||
diff --git a/meta/recipes-extended/bash/bash-3.2.57/dont-include-target-CFLAGS-in-host-LDFLAGS.patch b/meta/recipes-extended/bash/bash-3.2.57/dont-include-target-CFLAGS-in-host-LDFLAGS.patch deleted file mode 100644 index ee756dc9e3..0000000000 --- a/meta/recipes-extended/bash/bash-3.2.57/dont-include-target-CFLAGS-in-host-LDFLAGS.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From 933bd886af49667e88e2385409449ab598813dab Mon Sep 17 00:00:00 2001 | ||
2 | From: Andre McCurdy <armccurdy@gmail.com> | ||
3 | Date: Wed, 15 Jul 2015 00:54:33 -0700 | ||
4 | Subject: [PATCH] dont include target CFLAGS in host LDFLAGS | ||
5 | |||
6 | Building the host tool 'mkbuiltins' will fail if the target CFLAGS | ||
7 | contains an option which isn't supported by the host's gcc. To prevent | ||
8 | the issue, define LDFLAGS_FOR_BUILD based on CFLAGS_FOR_BUILD instead | ||
9 | of CFLAGS. | ||
10 | |||
11 | Upstream-Status: Inappropriate [required for bash 3.2.57 (GPLv2) recipe only] | ||
12 | |||
13 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | ||
14 | --- | ||
15 | builtins/Makefile.in | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/builtins/Makefile.in b/builtins/Makefile.in | ||
19 | index e027f7a..ebfddf3 100644 | ||
20 | --- a/builtins/Makefile.in | ||
21 | +++ b/builtins/Makefile.in | ||
22 | @@ -63,7 +63,7 @@ LOCAL_DEFS = @LOCAL_DEFS@ | ||
23 | |||
24 | LIBS = @LIBS@ | ||
25 | LDFLAGS = @LDFLAGS@ $(LOCAL_LDFLAGS) $(CFLAGS) | ||
26 | -LDFLAGS_FOR_BUILD = $(LDFLAGS) | ||
27 | +LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ $(LOCAL_LDFLAGS) $(CFLAGS_FOR_BUILD) | ||
28 | LOCAL_LDFLAGS = @LOCAL_LDFLAGS@ | ||
29 | #LIBS_FOR_BUILD = @LIBS_FOR_BUILD@ | ||
30 | LIBS_FOR_BUILD = $(LIBS) | ||
31 | -- | ||
32 | 1.9.1 | ||
33 | |||
diff --git a/meta/recipes-extended/bash/bash-3.2.57/mkbuiltins_have_stringize.patch b/meta/recipes-extended/bash/bash-3.2.57/mkbuiltins_have_stringize.patch deleted file mode 100644 index c4229a7ed9..0000000000 --- a/meta/recipes-extended/bash/bash-3.2.57/mkbuiltins_have_stringize.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
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 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | ||
18 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
19 | |||
20 | --- bash-4.2.orig/builtins/mkbuiltins.c | ||
21 | +++ bash-4.2/builtins/mkbuiltins.c | ||
22 | @@ -28,6 +28,7 @@ | ||
23 | # define HAVE_STDLIB_H | ||
24 | |||
25 | # define HAVE_RENAME | ||
26 | +# define HAVE_STRINGIZE | ||
27 | #endif /* CROSS_COMPILING */ | ||
28 | |||
29 | #if defined (HAVE_UNISTD_H) | ||
diff --git a/meta/recipes-extended/bash/bash-3.2.57/run-ptest b/meta/recipes-extended/bash/bash-3.2.57/run-ptest deleted file mode 100644 index 8dd3b9981d..0000000000 --- a/meta/recipes-extended/bash/bash-3.2.57/run-ptest +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | make -k THIS_SH=/bin/bash BUILD_DIR=. runtest | ||
diff --git a/meta/recipes-extended/bash/bash-3.2.57/string-format.patch b/meta/recipes-extended/bash/bash-3.2.57/string-format.patch deleted file mode 100644 index eda39649d9..0000000000 --- a/meta/recipes-extended/bash/bash-3.2.57/string-format.patch +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | Fix a string format warning when using security flags: | ||
2 | |||
3 | | ../bash-3.2.48/print_cmd.c:1152:3: error: format not a string literal and no format arguments [-Werror=format-security] | ||
4 | | cprintf (indentation_string); | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
8 | |||
9 | diff --git a/print_cmd.c b/print_cmd.c | ||
10 | index d1dfd1a..956db53 100644 | ||
11 | --- a/print_cmd.c | ||
12 | +++ b/print_cmd.c | ||
13 | @@ -1149,7 +1149,7 @@ indent (amount) | ||
14 | for (i = 0; amount > 0; amount--) | ||
15 | indentation_string[i++] = ' '; | ||
16 | indentation_string[i] = '\0'; | ||
17 | - cprintf (indentation_string); | ||
18 | + cprintf ("%s", indentation_string); | ||
19 | } | ||
20 | |||
21 | static void | ||
diff --git a/meta/recipes-extended/bash/bash-3.2.57/test-output.patch b/meta/recipes-extended/bash/bash-3.2.57/test-output.patch deleted file mode 100644 index 2b09b7d977..0000000000 --- a/meta/recipes-extended/bash/bash-3.2.57/test-output.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
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 | |||
diff --git a/meta/recipes-extended/bash/bash_3.2.57.bb b/meta/recipes-extended/bash/bash_3.2.57.bb deleted file mode 100644 index 5c288b35a2..0000000000 --- a/meta/recipes-extended/bash/bash_3.2.57.bb +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | require bash.inc | ||
2 | |||
3 | LICENSE = "GPLv2+" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=fd5d9bcabd8ed5a54a01ce8d183d592a" | ||
5 | |||
6 | SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ | ||
7 | file://mkbuiltins_have_stringize.patch \ | ||
8 | file://build-tests.patch \ | ||
9 | file://test-output.patch \ | ||
10 | file://run-ptest \ | ||
11 | file://dont-include-target-CFLAGS-in-host-LDFLAGS.patch \ | ||
12 | file://string-format.patch \ | ||
13 | " | ||
14 | |||
15 | SRC_URI[md5sum] = "237a8767c990b43ae2c89895c2dbc062" | ||
16 | SRC_URI[sha256sum] = "3fa9daf85ebf35068f090ce51283ddeeb3c75eb5bc70b1a4a7cb05868bfe06a4" | ||
17 | |||
18 | PARALLEL_MAKE = "" | ||