diff options
Diffstat (limited to 'yocto-poky/meta/recipes-support/boost')
| -rw-r--r-- | yocto-poky/meta/recipes-support/boost/bjam-native_1.60.0.bb (renamed from yocto-poky/meta/recipes-support/boost/bjam-native_1.58.0.bb) | 0 | ||||
| -rw-r--r-- | yocto-poky/meta/recipes-support/boost/boost-1.60.0.inc (renamed from yocto-poky/meta/recipes-support/boost/boost-1.58.0.inc) | 9 | ||||
| -rw-r--r-- | yocto-poky/meta/recipes-support/boost/boost.inc | 17 | ||||
| -rw-r--r-- | yocto-poky/meta/recipes-support/boost/boost/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch | 45 | ||||
| -rw-r--r-- | yocto-poky/meta/recipes-support/boost/boost/consider-hardfp.patch | 19 | ||||
| -rw-r--r-- | yocto-poky/meta/recipes-support/boost/boost_1.58.0.bb | 6 | ||||
| -rw-r--r-- | yocto-poky/meta/recipes-support/boost/boost_1.60.0.bb | 8 | ||||
| -rw-r--r-- | yocto-poky/meta/recipes-support/boost/files/0001-mips1-fix-added-gcc.jam-was-passing-the-options-m32-.patch | 33 | ||||
| -rw-r--r-- | yocto-poky/meta/recipes-support/boost/files/0002-Don-t-pass-m32-m64-where-it-s-not-supported.patch | 40 |
9 files changed, 85 insertions, 92 deletions
diff --git a/yocto-poky/meta/recipes-support/boost/bjam-native_1.58.0.bb b/yocto-poky/meta/recipes-support/boost/bjam-native_1.60.0.bb index 32646d707..32646d707 100644 --- a/yocto-poky/meta/recipes-support/boost/bjam-native_1.58.0.bb +++ b/yocto-poky/meta/recipes-support/boost/bjam-native_1.60.0.bb diff --git a/yocto-poky/meta/recipes-support/boost/boost-1.58.0.inc b/yocto-poky/meta/recipes-support/boost/boost-1.60.0.inc index b47d09133..a38693e25 100644 --- a/yocto-poky/meta/recipes-support/boost/boost-1.58.0.inc +++ b/yocto-poky/meta/recipes-support/boost/boost-1.60.0.inc @@ -11,12 +11,9 @@ BOOST_VER = "${@"_".join(d.getVar("PV",1).split("."))}" BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}" BOOST_P = "boost_${BOOST_VER}" -SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \ - file://0001-mips1-fix-added-gcc.jam-was-passing-the-options-m32-.patch \ - file://0002-Don-t-pass-m32-m64-where-it-s-not-supported.patch \ -" +SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2" -SRC_URI[md5sum] = "b8839650e61e9c1c0a89f371dd475546" -SRC_URI[sha256sum] = "fdfc204fc33ec79c99b9a74944c3e54bd78be4f7f15e260c0e2700a36dc7d3e5" +SRC_URI[md5sum] = "65a840e1a0b13a558ff19eeb2c4f0cbe" +SRC_URI[sha256sum] = "686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b" S = "${WORKDIR}/${BOOST_P}" diff --git a/yocto-poky/meta/recipes-support/boost/boost.inc b/yocto-poky/meta/recipes-support/boost/boost.inc index 3288e845f..982446c06 100644 --- a/yocto-poky/meta/recipes-support/boost/boost.inc +++ b/yocto-poky/meta/recipes-support/boost/boost.inc @@ -2,7 +2,8 @@ SUMMARY = "Free peer-reviewed portable C++ source libraries" SECTION = "libs" DEPENDS = "bjam-native zlib bzip2" -ARM_INSTRUCTION_SET = "arm" +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" BOOST_LIBS = "\ atomic \ @@ -18,6 +19,7 @@ BOOST_LIBS = "\ serialization \ signals \ system \ + timer \ test \ thread \ " @@ -59,6 +61,7 @@ FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so.* \ # -dev last to pick up the remaining stuff PACKAGES += "${PN}-dev ${PN}-staticdev" +FILES_${PN} = "" FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so" FILES_${PN}-staticdev = "${libdir}/libboost_*.a" @@ -112,9 +115,9 @@ BJAM_TOOLS = "--ignore-site-config \ '--layout=system' \ " -# use PARALLEL_MAKE to speed up the build, but limit it by -j 64, greater paralelism causes bjam to segfault or to ignore -j +# use PARALLEL_MAKE to speed up the build, but limit it by -j 64, greater parallelism causes bjam to segfault or to ignore -j # https://svn.boost.org/trac/boost/ticket/7634 -def get_boost_parallel_make(bb, d): +def get_boost_parallel_make(d): pm = d.getVar('PARALLEL_MAKE', True) if pm: # look for '-j' and throw other options (e.g. '-l') away @@ -136,11 +139,11 @@ def get_boost_parallel_make(bb, d): return "" -BOOST_PARALLEL_MAKE = "${@get_boost_parallel_make(bb, d)}" -BJAM_OPTS = '${BOOST_PARALLEL_MAKE} \ +BOOST_PARALLEL_MAKE = "${@get_boost_parallel_make(d)}" +BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \ ${BJAM_TOOLS} \ -sBOOST_BUILD_USER_CONFIG=${S}/tools/build/example/user-config.jam \ - --builddir=${S}/${TARGET_SYS} \ + --build-dir=${S}/${TARGET_SYS} \ --disable-icu \ ${BJAM_EXTRA}' @@ -155,7 +158,7 @@ do_boostconfig() { sed -i "/^using python : ${PYTHON_BASEVERSION}"/d ${S}/tools/build/example/user-config.jam echo 'using gcc : 4.3.1 : ${CXX} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;' >> ${S}/tools/build/example/user-config.jam echo "using python : ${PYTHON_BASEVERSION} : : ${STAGING_INCDIR}/python${PYTHON_BASEVERSION} ;" >> ${S}/tools/build/example/user-config.jam - echo "using python : 3.4 : : ${STAGING_INCDIR}/python3.4m ;" >> ${S}/tools/build/example/user-config.jam + echo "using python : 3.5 : : ${STAGING_INCDIR}/python3.5m ;" >> ${S}/tools/build/example/user-config.jam CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" ./bootstrap.sh --with-bjam=bjam --with-toolset=gcc --with-python-root=${PYTHON_ROOT} sed -i '/^using python/d' project-config.jam diff --git a/yocto-poky/meta/recipes-support/boost/boost/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch b/yocto-poky/meta/recipes-support/boost/boost/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch new file mode 100644 index 000000000..df7e71fea --- /dev/null +++ b/yocto-poky/meta/recipes-support/boost/boost/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch @@ -0,0 +1,45 @@ +From f50e7bc9fed323c5705c0ed992c03e80eeec1dd6 Mon Sep 17 00:00:00 2001 +From: Jonathan Wakely <jwakely@redhat.com> +Date: Mon, 14 Sep 2015 15:05:24 +0100 +Subject: [PATCH] Do not qualify <fenv.h> names that might be macros. + +The patch was imported from the boost-test git repository +(https://github.com/boostorg/test) as of commit id +f50e7bc9fed323c5705c0ed992c03e80eeec1dd6. + +Upstream-Status: Accepted [commit f50e7bc9fed in develop branch] + +Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de> +--- + include/boost/test/impl/execution_monitor.ipp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/include/boost/test/impl/execution_monitor.ipp b/include/boost/test/impl/execution_monitor.ipp +index b3e873e..a7bdce2 100644 +--- a/include/boost/test/impl/execution_monitor.ipp ++++ b/include/boost/test/impl/execution_monitor.ipp +@@ -1380,8 +1380,8 @@ enable( unsigned mask ) + + return ~old_cw & BOOST_FPE_ALL; + #elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H) +- ::feclearexcept(BOOST_FPE_ALL); +- int res = ::feenableexcept( mask ); ++ feclearexcept(BOOST_FPE_ALL); ++ int res = feenableexcept( mask ); + return res == -1 ? (unsigned)BOOST_FPE_INV : (unsigned)res; + #else + /* Not Implemented */ +@@ -1417,8 +1417,8 @@ disable( unsigned mask ) + + return ~old_cw & BOOST_FPE_ALL; + #elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H) +- ::feclearexcept(BOOST_FPE_ALL); +- int res = ::fedisableexcept( mask ); ++ feclearexcept(BOOST_FPE_ALL); ++ int res = fedisableexcept( mask ); + return res == -1 ? (unsigned)BOOST_FPE_INV : (unsigned)res; + #else + /* Not Implemented */ +-- +1.9.1 + diff --git a/yocto-poky/meta/recipes-support/boost/boost/consider-hardfp.patch b/yocto-poky/meta/recipes-support/boost/boost/consider-hardfp.patch new file mode 100644 index 000000000..66808a69d --- /dev/null +++ b/yocto-poky/meta/recipes-support/boost/boost/consider-hardfp.patch @@ -0,0 +1,19 @@ +When using soft-float, on ARM we should not expect the FE_* symbols + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending + +Index: boost_1_60_0/boost/test/execution_monitor.hpp +=================================================================== +--- boost_1_60_0.orig/boost/test/execution_monitor.hpp ++++ boost_1_60_0/boost/test/execution_monitor.hpp +@@ -484,7 +484,8 @@ enum masks { + BOOST_FPE_UNDERFLOW = EM_UNDERFLOW|EM_DENORMAL, + + BOOST_FPE_ALL = MCW_EM, +-#elif defined(BOOST_NO_FENV_H) || defined(BOOST_CLANG) ++#elif defined(BOOST_NO_FENV_H) || defined(BOOST_CLANG) \ ++ || defined(__ARM_PCS) + BOOST_FPE_ALL = 1, + #else + BOOST_FPE_DIVBYZERO = FE_DIVBYZERO, diff --git a/yocto-poky/meta/recipes-support/boost/boost_1.58.0.bb b/yocto-poky/meta/recipes-support/boost/boost_1.58.0.bb deleted file mode 100644 index c09d5f431..000000000 --- a/yocto-poky/meta/recipes-support/boost/boost_1.58.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -include boost-${PV}.inc -include boost.inc - -SRC_URI += "\ - file://arm-intrinsics.patch \ -" diff --git a/yocto-poky/meta/recipes-support/boost/boost_1.60.0.bb b/yocto-poky/meta/recipes-support/boost/boost_1.60.0.bb new file mode 100644 index 000000000..4d824c85b --- /dev/null +++ b/yocto-poky/meta/recipes-support/boost/boost_1.60.0.bb @@ -0,0 +1,8 @@ +include boost-${PV}.inc +include boost.inc + +SRC_URI += "\ + file://arm-intrinsics.patch \ + file://0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch;striplevel=2 \ + file://consider-hardfp.patch \ +" diff --git a/yocto-poky/meta/recipes-support/boost/files/0001-mips1-fix-added-gcc.jam-was-passing-the-options-m32-.patch b/yocto-poky/meta/recipes-support/boost/files/0001-mips1-fix-added-gcc.jam-was-passing-the-options-m32-.patch deleted file mode 100644 index 329b4c361..000000000 --- a/yocto-poky/meta/recipes-support/boost/files/0001-mips1-fix-added-gcc.jam-was-passing-the-options-m32-.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 - diff --git a/yocto-poky/meta/recipes-support/boost/files/0002-Don-t-pass-m32-m64-where-it-s-not-supported.patch b/yocto-poky/meta/recipes-support/boost/files/0002-Don-t-pass-m32-m64-where-it-s-not-supported.patch deleted file mode 100644 index ecf7e550f..000000000 --- a/yocto-poky/meta/recipes-support/boost/files/0002-Don-t-pass-m32-m64-where-it-s-not-supported.patch +++ /dev/null @@ -1,40 +0,0 @@ -From f825634a56b119dfa9d712119a66279cc7635978 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks> -Date: Sat, 2 May 2015 14:24:02 +0200 -Subject: [PATCH 2/2] Don't pass -m32/-m64 where it's not supported. - -Only PowerPC, SPARC, and x86 do support the -m32 and -m64 compiler options [1]. - -Rather then excluding all architectures not supporting these options as it is -done in commit c0634341d9ee2c02d3a55c91dafb988afc066c49 [2], include all -architectures that do support them. - -This will fix building Boost for the SuperH architecture with Buildroot [3]. - -[1] https://gcc.gnu.org/onlinedocs/gcc/Option-Summary.html -[2] https://github.com/boostorg/build/commit/c0634341d9ee2c02d3a55c91dafb988afc066c49 -[3] http://autobuild.buildroot.net/results/ccd/ccd5c83963032ba49b1627b1dff39e34a9486943/build-end.log - -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 eff95ae..2f6af93 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 && $(arch) != mips1 -+ if $(arch) = power || $(arch) = sparc || $(arch) = x86 - { - if $(model) = 32 - { --- -1.7.9.5 - |