From f6f7db7c2ab409abab0e7a2f9d36a35419e76076 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 3 Jun 2016 12:14:44 +0300 Subject: boost: update to 1.61.0 0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch has been merged upstream. (From OE-Core rev: 25d4129bab9f6abeecbfec6b69612e387851bfe3) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-support/boost/bjam-native_1.60.0.bb | 18 --------- meta/recipes-support/boost/bjam-native_1.61.0.bb | 18 +++++++++ meta/recipes-support/boost/boost-1.60.0.inc | 19 --------- meta/recipes-support/boost/boost-1.61.0.inc | 19 +++++++++ ...qualify-fenv.h-names-that-might-be-macros.patch | 45 ---------------------- meta/recipes-support/boost/boost_1.60.0.bb | 8 ---- meta/recipes-support/boost/boost_1.61.0.bb | 7 ++++ 7 files changed, 44 insertions(+), 90 deletions(-) delete mode 100644 meta/recipes-support/boost/bjam-native_1.60.0.bb create mode 100644 meta/recipes-support/boost/bjam-native_1.61.0.bb delete mode 100644 meta/recipes-support/boost/boost-1.60.0.inc create mode 100644 meta/recipes-support/boost/boost-1.61.0.inc delete mode 100644 meta/recipes-support/boost/boost/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch delete mode 100644 meta/recipes-support/boost/boost_1.60.0.bb create mode 100644 meta/recipes-support/boost/boost_1.61.0.bb (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/boost/bjam-native_1.60.0.bb b/meta/recipes-support/boost/bjam-native_1.60.0.bb deleted file mode 100644 index 32646d707b..0000000000 --- a/meta/recipes-support/boost/bjam-native_1.60.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -include boost-${PV}.inc - -SUMMARY = "Portable Boost.Jam build tool for boost" -SECTION = "devel" - -inherit native - -SRC_URI += "file://bjam-native-build-bjam.debug.patch" - -do_compile() { - ./bootstrap.sh --with-toolset=gcc -} - -do_install() { - install -d ${D}${bindir}/ - # install unstripped version for bjam - install -c -m 755 bjam.debug ${D}${bindir}/bjam -} diff --git a/meta/recipes-support/boost/bjam-native_1.61.0.bb b/meta/recipes-support/boost/bjam-native_1.61.0.bb new file mode 100644 index 0000000000..32646d707b --- /dev/null +++ b/meta/recipes-support/boost/bjam-native_1.61.0.bb @@ -0,0 +1,18 @@ +include boost-${PV}.inc + +SUMMARY = "Portable Boost.Jam build tool for boost" +SECTION = "devel" + +inherit native + +SRC_URI += "file://bjam-native-build-bjam.debug.patch" + +do_compile() { + ./bootstrap.sh --with-toolset=gcc +} + +do_install() { + install -d ${D}${bindir}/ + # install unstripped version for bjam + install -c -m 755 bjam.debug ${D}${bindir}/bjam +} diff --git a/meta/recipes-support/boost/boost-1.60.0.inc b/meta/recipes-support/boost/boost-1.60.0.inc deleted file mode 100644 index a38693e25d..0000000000 --- a/meta/recipes-support/boost/boost-1.60.0.inc +++ /dev/null @@ -1,19 +0,0 @@ -# The Boost web site provides free peer-reviewed portable -# C++ source libraries. The emphasis is on libraries which -# work well with the C++ Standard Library. The libraries are -# intended to be widely useful, and are in regular use by -# thousands of programmers across a broad spectrum of applications. -HOMEPAGE = "http://www.boost.org/" -LICENSE = "BSL-1.0 & MIT & Python-2.0" -LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" - -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" - -SRC_URI[md5sum] = "65a840e1a0b13a558ff19eeb2c4f0cbe" -SRC_URI[sha256sum] = "686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b" - -S = "${WORKDIR}/${BOOST_P}" diff --git a/meta/recipes-support/boost/boost-1.61.0.inc b/meta/recipes-support/boost/boost-1.61.0.inc new file mode 100644 index 0000000000..4553677b26 --- /dev/null +++ b/meta/recipes-support/boost/boost-1.61.0.inc @@ -0,0 +1,19 @@ +# The Boost web site provides free peer-reviewed portable +# C++ source libraries. The emphasis is on libraries which +# work well with the C++ Standard Library. The libraries are +# intended to be widely useful, and are in regular use by +# thousands of programmers across a broad spectrum of applications. +HOMEPAGE = "http://www.boost.org/" +LICENSE = "BSL-1.0 & MIT & Python-2.0" +LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" + +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" + +SRC_URI[md5sum] = "6095876341956f65f9d35939ccea1a9f" +SRC_URI[sha256sum] = "a547bd06c2fd9a71ba1d169d9cf0339da7ebf4753849a8f7d6fdb8feee99b640" + +S = "${WORKDIR}/${BOOST_P}" diff --git a/meta/recipes-support/boost/boost/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch b/meta/recipes-support/boost/boost/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch deleted file mode 100644 index df7e71fea6..0000000000 --- a/meta/recipes-support/boost/boost/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch +++ /dev/null @@ -1,45 +0,0 @@ -From f50e7bc9fed323c5705c0ed992c03e80eeec1dd6 Mon Sep 17 00:00:00 2001 -From: Jonathan Wakely -Date: Mon, 14 Sep 2015 15:05:24 +0100 -Subject: [PATCH] Do not qualify 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 ---- - 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/meta/recipes-support/boost/boost_1.60.0.bb b/meta/recipes-support/boost/boost_1.60.0.bb deleted file mode 100644 index 4d824c85b5..0000000000 --- a/meta/recipes-support/boost/boost_1.60.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -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/meta/recipes-support/boost/boost_1.61.0.bb b/meta/recipes-support/boost/boost_1.61.0.bb new file mode 100644 index 0000000000..d8b14fed7b --- /dev/null +++ b/meta/recipes-support/boost/boost_1.61.0.bb @@ -0,0 +1,7 @@ +include boost-${PV}.inc +include boost.inc + +SRC_URI += "\ + file://arm-intrinsics.patch \ + file://consider-hardfp.patch \ +" -- cgit 1.2.3-korg