From 110ecc5d317f194f8d778200263d731a76967e77 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Mon, 3 Mar 2014 18:55:58 +0800 Subject: [PATCH] bash: update build-tests.patch (From OE-Core rev: 3c234df240a11903ef3588a2c078dcbce4ca1719) Signed-off-by: Hongxu Jia Signed-off-by: Richard Purdie --- .../bash/{bash-4.2 => bash}/build-tests.patch | 33 +++++++++++++--------- 1 file changed, 20 insertions(+), 13 deletions(-) rename meta/recipes-extended/bash/{bash-4.2 => bash}/build-tests.patch (51%) diff --git a/meta/recipes-extended/bash/bash-4.2/build-tests.patch b/meta/recipes-extended/bash/bash/build-tests.patch similarity index 51% rename from meta/recipes-extended/bash/bash-4.2/build-tests.patch rename to meta/recipes-extended/bash/bash/build-tests.patch index 0360881..73a81b6 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 @@ Add 'ptest' target to Makefile, to run tests without checking dependencies. -Signed-off-by: Anders Roxell Upstream-Status: Pending +Signed-off-by: Anders Roxell +Signed-off-by: Hongxu Jia --- -diff -uNr a/Makefile.in b/Makefile.in ---- a/Makefile.in 2012-11-06 08:40:07.552403063 +0100 -+++ b/Makefile.in 2012-11-06 11:13:36.958297555 +0100 -@@ -827,20 +827,34 @@ + Makefile.in | 24 +++++++++++++++++++----- + 1 file changed, 19 insertions(+), 5 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +--- a/Makefile.in ++++ b/Makefile.in +@@ -848,20 +848,34 @@ maybe-clean: fi recho$(EXEEXT): $(SUPPORT_SRC)recho.c -- @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) -o $@ $(SUPPORT_SRC)recho.c ${LIBS_FOR_BUILD} -+ @$(CC) $(CCFLAGS) -o $@ $< +- @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) ${LDFLAGS_FOR_BUILD} -o $@ $(SUPPORT_SRC)recho.c ${LIBS_FOR_BUILD} ++ @$(CC) $(CCFLAGS) ${LDFLAGS} -o $@ $< zecho$(EXEEXT): $(SUPPORT_SRC)zecho.c -- @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) -o $@ $(SUPPORT_SRC)zecho.c ${LIBS_FOR_BUILD} -+ @$(CC) $(CCFLAGS) -o $@ $< +- @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) ${LDFLAGS_FOR_BUILD} -o $@ $(SUPPORT_SRC)zecho.c ${LIBS_FOR_BUILD} ++ @$(CC) $(CCFLAGS) ${LDFLAGS} -o $@ $< printenv$(EXEEXT): $(SUPPORT_SRC)printenv.c -- @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) -o $@ $(SUPPORT_SRC)printenv.c ${LIBS_FOR_BUILD} -+ @$(CC) $(CCFLAGS) -o $@ $< +- @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) ${LDFLAGS_FOR_BUILD} -o $@ $(SUPPORT_SRC)printenv.c ${LIBS_FOR_BUILD} ++ @$(CC) $(CCFLAGS) ${LDFLAGS} -o $@ $< xcase$(EXEEXT): $(SUPPORT_SRC)xcase.c -- @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) -o $@ $(SUPPORT_SRC)xcase.c ${LIBS_FOR_BUILD} -+ @$(CC) $(CCFLAGS) -o $@ $< +- @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) ${LDFLAGS_FOR_BUILD} -o $@ $(SUPPORT_SRC)xcase.c ${LIBS_FOR_BUILD} ++ @$(CC) $(CCFLAGS) ${LDFLAGS} -o $@ $< -test tests check: force $(Program) $(TESTS_SUPPORT) +test tests check: @@ -46,3 +50,6 @@ diff -uNr a/Makefile.in b/Makefile.in @( cd $(srcdir)/tests && \ PATH=$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} ) +-- +1.8.1.2 + -- 2.7.4