diff options
| -rw-r--r-- | meta/recipes-extended/bash/bash-3.2.48/dont-include-target-CFLAGS-in-host-LDFLAGS.patch | 33 | ||||
| -rw-r--r-- | meta/recipes-extended/bash/bash_3.2.48.bb | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-extended/bash/bash-3.2.48/dont-include-target-CFLAGS-in-host-LDFLAGS.patch b/meta/recipes-extended/bash/bash-3.2.48/dont-include-target-CFLAGS-in-host-LDFLAGS.patch new file mode 100644 index 0000000000..ee756dc9e3 --- /dev/null +++ b/meta/recipes-extended/bash/bash-3.2.48/dont-include-target-CFLAGS-in-host-LDFLAGS.patch @@ -0,0 +1,33 @@ +From 933bd886af49667e88e2385409449ab598813dab Mon Sep 17 00:00:00 2001 +From: Andre McCurdy <armccurdy@gmail.com> +Date: Wed, 15 Jul 2015 00:54:33 -0700 +Subject: [PATCH] dont include target CFLAGS in host LDFLAGS + +Building the host tool 'mkbuiltins' will fail if the target CFLAGS +contains an option which isn't supported by the host's gcc. To prevent +the issue, define LDFLAGS_FOR_BUILD based on CFLAGS_FOR_BUILD instead +of CFLAGS. + +Upstream-Status: Inappropriate [required for bash 3.2.57 (GPLv2) recipe only] + +Signed-off-by: Andre McCurdy <armccurdy@gmail.com> +--- + builtins/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/builtins/Makefile.in b/builtins/Makefile.in +index e027f7a..ebfddf3 100644 +--- a/builtins/Makefile.in ++++ b/builtins/Makefile.in +@@ -63,7 +63,7 @@ LOCAL_DEFS = @LOCAL_DEFS@ + + LIBS = @LIBS@ + LDFLAGS = @LDFLAGS@ $(LOCAL_LDFLAGS) $(CFLAGS) +-LDFLAGS_FOR_BUILD = $(LDFLAGS) ++LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ $(LOCAL_LDFLAGS) $(CFLAGS_FOR_BUILD) + LOCAL_LDFLAGS = @LOCAL_LDFLAGS@ + #LIBS_FOR_BUILD = @LIBS_FOR_BUILD@ + LIBS_FOR_BUILD = $(LIBS) +-- +1.9.1 + diff --git a/meta/recipes-extended/bash/bash_3.2.48.bb b/meta/recipes-extended/bash/bash_3.2.48.bb index 34272d1e25..d42b292b0a 100644 --- a/meta/recipes-extended/bash/bash_3.2.48.bb +++ b/meta/recipes-extended/bash/bash_3.2.48.bb @@ -19,6 +19,7 @@ SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz;name=tarball \ file://build-tests.patch \ file://test-output.patch \ file://run-ptest \ + file://dont-include-target-CFLAGS-in-host-LDFLAGS.patch \ " SRC_URI[tarball.md5sum] = "338dcf975a93640bb3eaa843ca42e3f8" |