diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2014-03-03 18:55:58 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-05 15:50:21 +0000 |
commit | 5da3ba5457aa6c445d61bac10be37f2aa1548a28 (patch) | |
tree | 6f778d5df5e94d35dca986106ec1e4716f0854b6 /meta | |
parent | a1632697254fab3ca56f364e3866b2b5530ea9a2 (diff) | |
download | poky-5da3ba5457aa6c445d61bac10be37f2aa1548a28.tar.gz |
bash: update build-tests.patch
(From OE-Core rev: 3c234df240a11903ef3588a2c078dcbce4ca1719)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/bash/bash/build-tests.patch (renamed from meta/recipes-extended/bash/bash-4.2/build-tests.patch) | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/meta/recipes-extended/bash/bash-4.2/build-tests.patch b/meta/recipes-extended/bash/bash/build-tests.patch index 036088116d..73a81b60da 100644 --- a/meta/recipes-extended/bash/bash-4.2/build-tests.patch +++ b/meta/recipes-extended/bash/bash/build-tests.patch | |||
@@ -1,29 +1,33 @@ | |||
1 | Add 'ptest' target to Makefile, to run tests without checking dependencies. | 1 | Add 'ptest' target to Makefile, to run tests without checking dependencies. |
2 | 2 | ||
3 | Signed-off-by: Anders Roxell <anders.roxell@enea.com> | ||
4 | Upstream-Status: Pending | 3 | Upstream-Status: Pending |
4 | Signed-off-by: Anders Roxell <anders.roxell@enea.com> | ||
5 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
5 | --- | 6 | --- |
6 | diff -uNr a/Makefile.in b/Makefile.in | 7 | Makefile.in | 24 +++++++++++++++++++----- |
7 | --- a/Makefile.in 2012-11-06 08:40:07.552403063 +0100 | 8 | 1 file changed, 19 insertions(+), 5 deletions(-) |
8 | +++ b/Makefile.in 2012-11-06 11:13:36.958297555 +0100 | 9 | |
9 | @@ -827,20 +827,34 @@ | 10 | diff --git a/Makefile.in b/Makefile.in |
11 | --- a/Makefile.in | ||
12 | +++ b/Makefile.in | ||
13 | @@ -848,20 +848,34 @@ maybe-clean: | ||
10 | fi | 14 | fi |
11 | 15 | ||
12 | recho$(EXEEXT): $(SUPPORT_SRC)recho.c | 16 | recho$(EXEEXT): $(SUPPORT_SRC)recho.c |
13 | - @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) -o $@ $(SUPPORT_SRC)recho.c ${LIBS_FOR_BUILD} | 17 | - @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) ${LDFLAGS_FOR_BUILD} -o $@ $(SUPPORT_SRC)recho.c ${LIBS_FOR_BUILD} |
14 | + @$(CC) $(CCFLAGS) -o $@ $< | 18 | + @$(CC) $(CCFLAGS) ${LDFLAGS} -o $@ $< |
15 | 19 | ||
16 | zecho$(EXEEXT): $(SUPPORT_SRC)zecho.c | 20 | zecho$(EXEEXT): $(SUPPORT_SRC)zecho.c |
17 | - @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) -o $@ $(SUPPORT_SRC)zecho.c ${LIBS_FOR_BUILD} | 21 | - @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) ${LDFLAGS_FOR_BUILD} -o $@ $(SUPPORT_SRC)zecho.c ${LIBS_FOR_BUILD} |
18 | + @$(CC) $(CCFLAGS) -o $@ $< | 22 | + @$(CC) $(CCFLAGS) ${LDFLAGS} -o $@ $< |
19 | 23 | ||
20 | printenv$(EXEEXT): $(SUPPORT_SRC)printenv.c | 24 | printenv$(EXEEXT): $(SUPPORT_SRC)printenv.c |
21 | - @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) -o $@ $(SUPPORT_SRC)printenv.c ${LIBS_FOR_BUILD} | 25 | - @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) ${LDFLAGS_FOR_BUILD} -o $@ $(SUPPORT_SRC)printenv.c ${LIBS_FOR_BUILD} |
22 | + @$(CC) $(CCFLAGS) -o $@ $< | 26 | + @$(CC) $(CCFLAGS) ${LDFLAGS} -o $@ $< |
23 | 27 | ||
24 | xcase$(EXEEXT): $(SUPPORT_SRC)xcase.c | 28 | xcase$(EXEEXT): $(SUPPORT_SRC)xcase.c |
25 | - @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) -o $@ $(SUPPORT_SRC)xcase.c ${LIBS_FOR_BUILD} | 29 | - @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) ${LDFLAGS_FOR_BUILD} -o $@ $(SUPPORT_SRC)xcase.c ${LIBS_FOR_BUILD} |
26 | + @$(CC) $(CCFLAGS) -o $@ $< | 30 | + @$(CC) $(CCFLAGS) ${LDFLAGS} -o $@ $< |
27 | 31 | ||
28 | -test tests check: force $(Program) $(TESTS_SUPPORT) | 32 | -test tests check: force $(Program) $(TESTS_SUPPORT) |
29 | +test tests check: | 33 | +test tests check: |
@@ -46,3 +50,6 @@ diff -uNr a/Makefile.in b/Makefile.in | |||
46 | @( cd $(srcdir)/tests && \ | 50 | @( cd $(srcdir)/tests && \ |
47 | PATH=$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} ) | 51 | PATH=$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} ) |
48 | 52 | ||
53 | -- | ||
54 | 1.8.1.2 | ||
55 | |||