From a6afd754290cecbe57392d13477557051b438817 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 19 Aug 2014 07:49:09 -0700 Subject: boost: Upgrade to 1.56.0 Rebase boostconfig to handle moved user-config file Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-support/boost/bjam-native_1.55.0.bb | 15 --------------- meta/recipes-support/boost/bjam-native_1.56.0.bb | 15 +++++++++++++++ meta/recipes-support/boost/boost-1.55.0.inc | 19 ------------------- meta/recipes-support/boost/boost-1.56.0.inc | 19 +++++++++++++++++++ meta/recipes-support/boost/boost.inc | 8 ++++---- meta/recipes-support/boost/boost_1.55.0.bb | 4 ---- meta/recipes-support/boost/boost_1.56.0.bb | 4 ++++ 7 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 meta/recipes-support/boost/bjam-native_1.55.0.bb create mode 100644 meta/recipes-support/boost/bjam-native_1.56.0.bb delete mode 100644 meta/recipes-support/boost/boost-1.55.0.inc create mode 100644 meta/recipes-support/boost/boost-1.56.0.inc delete mode 100644 meta/recipes-support/boost/boost_1.55.0.bb create mode 100644 meta/recipes-support/boost/boost_1.56.0.bb (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/boost/bjam-native_1.55.0.bb b/meta/recipes-support/boost/bjam-native_1.55.0.bb deleted file mode 100644 index d85d1a96cb..0000000000 --- a/meta/recipes-support/boost/bjam-native_1.55.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -include boost-${PV}.inc - -SUMMARY = "Portable Boost.Jam build tool for boost" -SECTION = "devel" - -inherit native - -do_compile() { - ./bootstrap.sh --with-toolset=gcc -} - -do_install() { - install -d ${D}${bindir}/ - install -c -m 755 bjam ${D}${bindir}/ -} diff --git a/meta/recipes-support/boost/bjam-native_1.56.0.bb b/meta/recipes-support/boost/bjam-native_1.56.0.bb new file mode 100644 index 0000000000..d85d1a96cb --- /dev/null +++ b/meta/recipes-support/boost/bjam-native_1.56.0.bb @@ -0,0 +1,15 @@ +include boost-${PV}.inc + +SUMMARY = "Portable Boost.Jam build tool for boost" +SECTION = "devel" + +inherit native + +do_compile() { + ./bootstrap.sh --with-toolset=gcc +} + +do_install() { + install -d ${D}${bindir}/ + install -c -m 755 bjam ${D}${bindir}/ +} diff --git a/meta/recipes-support/boost/boost-1.55.0.inc b/meta/recipes-support/boost/boost-1.55.0.inc deleted file mode 100644 index 7daadb6c9e..0000000000 --- a/meta/recipes-support/boost/boost-1.55.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] = "d6eef4b4cacb2183f2bf265a5a03a354" -SRC_URI[sha256sum] = "fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52" - -S = "${WORKDIR}/${BOOST_P}" diff --git a/meta/recipes-support/boost/boost-1.56.0.inc b/meta/recipes-support/boost/boost-1.56.0.inc new file mode 100644 index 0000000000..24c32b4c6f --- /dev/null +++ b/meta/recipes-support/boost/boost-1.56.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] = "a744cf167b05d72335f27c88115f211d" +SRC_URI[sha256sum] = "134732acaf3a6e7eba85988118d943f0fa6b7f0850f65131fff89823ad30ff1d" + +S = "${WORKDIR}/${BOOST_P}" diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index 0a44d79746..ad1bc76184 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc @@ -120,7 +120,7 @@ def get_boost_parallel_make(bb, d): BOOST_PARALLEL_MAKE = "${@get_boost_parallel_make(bb, d)}" BJAM_OPTS = '${BOOST_PARALLEL_MAKE} \ ${BJAM_TOOLS} \ - -sBOOST_BUILD_USER_CONFIG=${S}/tools/build/v2/user-config.jam \ + -sBOOST_BUILD_USER_CONFIG=${S}/tools/build/example/user-config.jam \ --builddir=${S}/${TARGET_SYS} \ --disable-icu \ ${BJAM_EXTRA}' @@ -132,12 +132,12 @@ do_boostconfig() { cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp # D2194:Fixing the failure of "error: duplicate initialization of gcc with the following parameters" during compilation. - if ! grep -qe "^using gcc : 4.3.1" ${S}/tools/build/v2/user-config.jam + if ! grep -qe "^using gcc : 4.3.1" ${S}/tools/build/example/user-config.jam then - echo 'using gcc : 4.3.1 : ${CXX} : "${CFLAGS}" "${CXXFLAGS}" "${LDFLAGS}" ;' >> ${S}/tools/build/v2/user-config.jam + echo 'using gcc : 4.3.1 : ${CXX} : "${CFLAGS}" "${CXXFLAGS}" "${LDFLAGS}" ;' >> ${S}/tools/build/example/user-config.jam fi - echo "using python : ${PYTHON_BASEVERSION} : : ${STAGING_INCDIR}/python${PYTHON_BASEVERSION} ;" >> ${S}/tools/build/v2/user-config.jam + echo "using python : ${PYTHON_BASEVERSION} : : ${STAGING_INCDIR}/python${PYTHON_BASEVERSION} ;" >> ${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/meta/recipes-support/boost/boost_1.55.0.bb b/meta/recipes-support/boost/boost_1.55.0.bb deleted file mode 100644 index b199c88577..0000000000 --- a/meta/recipes-support/boost/boost_1.55.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -include boost-${PV}.inc -include boost.inc - -SRC_URI += "file://arm-intrinsics.patch" diff --git a/meta/recipes-support/boost/boost_1.56.0.bb b/meta/recipes-support/boost/boost_1.56.0.bb new file mode 100644 index 0000000000..b199c88577 --- /dev/null +++ b/meta/recipes-support/boost/boost_1.56.0.bb @@ -0,0 +1,4 @@ +include boost-${PV}.inc +include boost.inc + +SRC_URI += "file://arm-intrinsics.patch" -- cgit 1.2.3-korg