diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2015-06-01 01:02:42 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-01 22:19:22 +0100 |
| commit | 729592223a0c076abe2c58a0cf3f4c6d6583602c (patch) | |
| tree | edf51d9d7f3e87e39db6246cb9f691b5533a79a6 /meta/recipes-support/boost/files/0001-mips1-fix-added-gcc.jam-was-passing-the-options-m32-.patch | |
| parent | 4f4cfe8a4a0c602d6e11ea9bb75b52241deda9d6 (diff) | |
| download | openembedded-core-contrib-729592223a0c076abe2c58a0cf3f4c6d6583602c.tar.gz | |
boost: fix build for mips
Backport 2 patches to fix the build error on mips:
mips-poky-linux-g++: error: unrecognized command line option '-m32'
https://github.com/boostorg/build/commit/c0634341d9ee2c02d3a55c91dafb988afc066c49
https://github.com/boostorg/build/commit/9576ca216cae888d7efb5da97c009c245c5ba567
Apply the pacthes to both bjam-native and boost, so put the patches to
"files" dir.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/boost/files/0001-mips1-fix-added-gcc.jam-was-passing-the-options-m32-.patch')
| -rw-r--r-- | meta/recipes-support/boost/files/0001-mips1-fix-added-gcc.jam-was-passing-the-options-m32-.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-support/boost/files/0001-mips1-fix-added-gcc.jam-was-passing-the-options-m32-.patch b/meta/recipes-support/boost/files/0001-mips1-fix-added-gcc.jam-was-passing-the-options-m32-.patch new file mode 100644 index 0000000000..329b4c3612 --- /dev/null +++ b/meta/recipes-support/boost/files/0001-mips1-fix-added-gcc.jam-was-passing-the-options-m32-.patch @@ -0,0 +1,33 @@ +From 817aed0d755bf8c0ba4ef6a77d41538e50b571fd Mon Sep 17 00:00:00 2001 +From: claymore <carlosmf.pt@gmail.com> +Date: Fri, 24 Apr 2015 02:28:47 +0100 +Subject: [PATCH 1/2] mips1 fix added gcc.jam was passing the options -m32 and + -m64 to mips cross-compilers, when those do not use + such options This modification solves it by adding mips + as an exception + +Signed-off-by: Carlos M. Ferreira carlosmf.pt@gmail.com + +Upstream-Status: Backport +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> + +--- + tools/build/src/tools/gcc.jam | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam +index db04534..eff95ae 100644 +--- a/tools/build/src/tools/gcc.jam ++++ b/tools/build/src/tools/gcc.jam +@@ -451,7 +451,7 @@ rule setup-address-model ( targets * : sources * : properties * ) + else + { + local arch = [ feature.get-values architecture : $(properties) ] ; +- if $(arch) != arm ++ if $(arch) != arm && $(arch) != mips1 + { + if $(model) = 32 + { +-- +1.7.9.5 + |