diff options
author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-11-04 19:45:03 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-11-04 19:46:45 +0100 |
commit | 052a320a9c1139d5457c0baa5ee0288302862a4e (patch) | |
tree | 216fd8419faebaa2886cef5b7b3690b06ecc9f52 /package/boost | |
parent | 884cac05f18761bffc180a4bf16fc11dc5763b05 (diff) |
boost: fix compile for MIPS
Diffstat (limited to 'package/boost')
-rw-r--r-- | package/boost/Makefile | 19 | ||||
-rw-r--r-- | package/boost/patches/patch-tools_build_src_tools_gcc_jam | 11 |
2 files changed, 27 insertions, 3 deletions
diff --git a/package/boost/Makefile b/package/boost/Makefile index 91240a58a..9b14cb103 100644 --- a/package/boost/Makefile +++ b/package/boost/Makefile @@ -54,6 +54,8 @@ CONFIGURE_ARGS+= --target=$(GNU_TARGET_NAME) \ --prefix=${WRKINST}/usr \ --ignore-site-config \ --without-mpi \ + --without-context \ + --without-coroutine \ --without-locale ifneq (${ADK_PACKAGE_BOOST_IOSTREAMS},) @@ -95,16 +97,27 @@ ifeq (${ADK_PACKAGE_BOOST_WAVE},) CONFIGURE_ARGS+= --without-wave endif +BOOST_ARCH:= $(ADK_TARGET_ARCH) + ifeq ($(ADK_TARGET_ARCH),x86_64) BOOST_ARCH:= x86 -else ifeq ($(ADK_TARGET_ARCH),ppc) +endif +ifeq ($(ADK_TARGET_ARCH),ppc) BOOST_ARCH:= power -else -BOOST_ARCH:= $(ADK_TARGET_ARCH) endif +ifeq ($(ADK_CPU_MIPS_MIPS32),y) +BOOST_ARCH:= mips32 +endif +ifeq ($(ADK_CPU_MIPS_MIPS32R2),y) +BOOST_ARCH:= mips32r2 +endif + ifeq ($(ADK_TARGET_ARCH),arm) BOOST_ABI:= abi=aapcs endif +ifeq ($(ADK_TARGET_ARCH),mips) +BOOST_ABI:= abi=o32 +endif # some variables for build GPP_PATH:= ${TOOLCHAIN_DIR}/usr/bin/${GNU_TARGET_NAME}-g++ diff --git a/package/boost/patches/patch-tools_build_src_tools_gcc_jam b/package/boost/patches/patch-tools_build_src_tools_gcc_jam new file mode 100644 index 000000000..a4013848d --- /dev/null +++ b/package/boost/patches/patch-tools_build_src_tools_gcc_jam @@ -0,0 +1,11 @@ +--- boost_1_58_0.orig/tools/build/src/tools/gcc.jam 2015-04-04 19:25:07.000000000 +0200 ++++ boost_1_58_0/tools/build/src/tools/gcc.jam 2015-11-03 20:58:00.000000000 +0100 +@@ -451,7 +451,7 @@ rule setup-address-model ( targets * : s + else + { + local arch = [ feature.get-values architecture : $(properties) ] ; +- if $(arch) != arm ++ if $(arch) = power || $(arch) = sparc || $(arch) = x86 + { + if $(model) = 32 + { |