diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-extended/bash/bash-3.2.48')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-extended/bash/bash-3.2.48/build-tests.patch | 6 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-extended/bash/bash-3.2.48/string-format.patch | 21 |
2 files changed, 24 insertions, 3 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-extended/bash/bash-3.2.48/build-tests.patch b/import-layers/yocto-poky/meta/recipes-extended/bash/bash-3.2.48/build-tests.patch index 91341ee69..e63457cf2 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/bash/bash-3.2.48/build-tests.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/bash/bash-3.2.48/build-tests.patch @@ -11,15 +11,15 @@ diff -dNaur bash-3.2.48/Makefile.in.orig bash-3.2.48/Makefile.in recho$(EXEEXT): $(SUPPORT_SRC)recho.c - @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) -o $@ $(SUPPORT_SRC)recho.c ${LIBS_FOR_BUILD} -+ @$(CC) $(CCFLAGS) -o $@ $< ++ @$(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) $(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) $(CCFLAGS) $(LDFLAGS) -o $@ $< -test tests check: force $(Program) $(TESTS_SUPPORT) +test tests check: diff --git a/import-layers/yocto-poky/meta/recipes-extended/bash/bash-3.2.48/string-format.patch b/import-layers/yocto-poky/meta/recipes-extended/bash/bash-3.2.48/string-format.patch new file mode 100644 index 000000000..eda39649d --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/bash/bash-3.2.48/string-format.patch @@ -0,0 +1,21 @@ +Fix a string format warning when using security flags: + +| ../bash-3.2.48/print_cmd.c:1152:3: error: format not a string literal and no format arguments [-Werror=format-security] +| cprintf (indentation_string); + +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/print_cmd.c b/print_cmd.c +index d1dfd1a..956db53 100644 +--- a/print_cmd.c ++++ b/print_cmd.c +@@ -1149,7 +1149,7 @@ indent (amount) + for (i = 0; amount > 0; amount--) + indentation_string[i++] = ' '; + indentation_string[i] = '\0'; +- cprintf (indentation_string); ++ cprintf ("%s", indentation_string); + } + + static void |