From c31030d87cd1741a4186d711325b8eab9c70b327 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 18 Oct 2016 16:28:18 +0300 Subject: boost: update to 1.62.0 Remove backported 0003-smart_ptr-mips-assembly-doesn-t-compile-in-mips16e-m.patch Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- meta/recipes-support/boost/bjam-native_1.61.0.bb | 18 ------- meta/recipes-support/boost/bjam-native_1.62.0.bb | 18 +++++++ meta/recipes-support/boost/boost-1.61.0.inc | 19 ------- meta/recipes-support/boost/boost-1.62.0.inc | 19 +++++++ ...ips-assembly-doesn-t-compile-in-mips16e-m.patch | 60 ---------------------- meta/recipes-support/boost/boost_1.61.0.bb | 13 ----- meta/recipes-support/boost/boost_1.62.0.bb | 12 +++++ 7 files changed, 49 insertions(+), 110 deletions(-) delete mode 100644 meta/recipes-support/boost/bjam-native_1.61.0.bb create mode 100644 meta/recipes-support/boost/bjam-native_1.62.0.bb delete mode 100644 meta/recipes-support/boost/boost-1.61.0.inc create mode 100644 meta/recipes-support/boost/boost-1.62.0.inc delete mode 100644 meta/recipes-support/boost/boost/0003-smart_ptr-mips-assembly-doesn-t-compile-in-mips16e-m.patch delete mode 100644 meta/recipes-support/boost/boost_1.61.0.bb create mode 100644 meta/recipes-support/boost/boost_1.62.0.bb diff --git a/meta/recipes-support/boost/bjam-native_1.61.0.bb b/meta/recipes-support/boost/bjam-native_1.61.0.bb deleted file mode 100644 index 32646d707b..0000000000 --- a/meta/recipes-support/boost/bjam-native_1.61.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.62.0.bb b/meta/recipes-support/boost/bjam-native_1.62.0.bb new file mode 100644 index 0000000000..32646d707b --- /dev/null +++ b/meta/recipes-support/boost/bjam-native_1.62.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.61.0.inc b/meta/recipes-support/boost/boost-1.61.0.inc deleted file mode 100644 index cd9d8a4950..0000000000 --- a/meta/recipes-support/boost/boost-1.61.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", True).split("."))}" -BOOST_MAJ = "${@"_".join(d.getVar("PV", True).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-1.62.0.inc b/meta/recipes-support/boost/boost-1.62.0.inc new file mode 100644 index 0000000000..a097ea1144 --- /dev/null +++ b/meta/recipes-support/boost/boost-1.62.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", True).split("."))}" +BOOST_MAJ = "${@"_".join(d.getVar("PV", True).split(".")[0:2])}" +BOOST_P = "boost_${BOOST_VER}" + +SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2" + +SRC_URI[md5sum] = "7ef085456c48c49a7fe8237f07e5f674" +SRC_URI[sha256sum] = "bce80293052e2d6230f1bec9b7524b33412e4fb26e9723460a0f362ac15b7acb" + +S = "${WORKDIR}/${BOOST_P}" diff --git a/meta/recipes-support/boost/boost/0003-smart_ptr-mips-assembly-doesn-t-compile-in-mips16e-m.patch b/meta/recipes-support/boost/boost/0003-smart_ptr-mips-assembly-doesn-t-compile-in-mips16e-m.patch deleted file mode 100644 index 2b48d0d5dd..0000000000 --- a/meta/recipes-support/boost/boost/0003-smart_ptr-mips-assembly-doesn-t-compile-in-mips16e-m.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 4f19d72ca94418431e068cfd4ffb96ed9b289f6c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= -Date: Wed, 24 Aug 2016 17:34:59 +0100 -Subject: [PATCH 3/4] smart_ptr: mips assembly doesn't compile in mips16e mode -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -gcc.compile.c++ /boost/bin.v2/libs/date_time/build/gcc-4.3.1/release/threading-multi/gregorian/greg_month.o - - "mipsel-poky-linux-musl-g++" "-mel" "-mabi=32" "-msoft-float" "-march=mips32r2" "-mips16" "-minterlink-compressed" "-mtune=24kec" "-mdsp" "-Wl,-O1" "-Wl,--as-needed" "-fstack-protector-strong" "-Wl,-z,relro,-z,now" "--sysroot=" -ftemplate-depth-128 -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map==/usr/src/debug/boost/1.61.0-r0 -fdebug-prefix-map== -fdebug-prefix-map== -fstack-protector-strong -pie -fpie -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -fvisibility-inlines-hidden -O3 -finline-functions -Wno-inline -Wall -pthread -fPIC -DBOOST_ALL_DYN_LINK=1 -DBOOST_ALL_NO_LIB=1 -DDATE_TIME_INLINE -DNDEBUG -I"." -c -o "/boost/bin.v2/libs/date_time/build/gcc-4.3.1/release/threading-multi/gregorian/greg_month.o" "libs/date_time/src/gregorian/greg_month.cpp" - -{standard input}: Assembler messages: -{standard input}:17603: Warning: the `dsp' extension requires MIPS32 revision 2 or greater -{standard input}:17604: Error: unrecognized opcode `ll $3,4($16)' -{standard input}:17606: Error: unrecognized opcode `sc $2,4($16)' -{standard input}:17734: Error: unrecognized opcode `ll $3,8($16)' -{standard input}:17736: Error: unrecognized opcode `sc $2,8($16)' -{standard input}:18084: Error: unrecognized opcode `ll $3,4($4)' -{standard input}:18086: Error: unrecognized opcode `sc $2,4($4)' -{standard input}:18318: Error: unrecognized opcode `ll $3,8($4)' -{standard input}:18320: Error: unrecognized opcode `sc $2,8($4)' -{standard input}:19921: Error: unrecognized opcode `ll $3,4($2)' -{standard input}:19923: Error: unrecognized opcode `sc $3,4($2)' -{standard input}:20199: Error: unrecognized opcode `ll $4,4($16)' -{standard input}:20201: Error: unrecognized opcode `sc $2,4($16)' -{standard input}:23392: Error: unrecognized opcode `ll $4,8($16)' -{standard input}:23394: Error: unrecognized opcode `sc $2,8($16)' -...failed updating 1 target... - -boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp -contains hand-written MIPS assembly, which is not compatible -with the MIPS16e instruction set. - -By not using this file in MIPS16e mode, we fallback to using -g++ 4.1+ __sync intrinsics (__sync_fetch_and_add() and -__sync_val_compare_and_swap()) which are working fine. - -Signed-off-by: André Draszik ---- -Upstream-Status: Backport https://svn.boost.org/trac/boost/ticket/12418 - boost/smart_ptr/detail/sp_counted_base.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/boost/smart_ptr/detail/sp_counted_base.hpp b/boost/smart_ptr/detail/sp_counted_base.hpp -index 0addf07..0995ca8 100644 ---- a/boost/smart_ptr/detail/sp_counted_base.hpp -+++ b/boost/smart_ptr/detail/sp_counted_base.hpp -@@ -65,7 +65,7 @@ - #elif defined( __GNUC__ ) && ( defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc ) ) && !defined(__PATHSCALE__) && !defined( _AIX ) - # include - --#elif defined( __GNUC__ ) && ( defined( __mips__ ) || defined( _mips ) ) && !defined(__PATHSCALE__) -+#elif defined( __GNUC__ ) && ( defined( __mips__ ) || defined( _mips ) ) && !defined(__PATHSCALE__) && !defined( __mips16 ) - # include - - #elif defined( BOOST_SP_HAS_SYNC ) --- -2.9.3 - diff --git a/meta/recipes-support/boost/boost_1.61.0.bb b/meta/recipes-support/boost/boost_1.61.0.bb deleted file mode 100644 index 40e3870a3d..0000000000 --- a/meta/recipes-support/boost/boost_1.61.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -include boost-${PV}.inc -include boost.inc - -SRC_URI += "\ - file://arm-intrinsics.patch \ - file://consider-hardfp.patch \ - file://boost-CVE-2012-2677.patch \ - file://0001-boost-asio-detail-socket_types.hpp-fix-poll.h-includ.patch \ - file://0002-boost-test-execution_monitor.hpp-fix-mips-soft-float.patch \ - file://0003-smart_ptr-mips-assembly-doesn-t-compile-in-mips16e-m.patch \ - file://0004-Use-atomic-by-default-when-BOOST_NO_CXX11_HDR_ATOMIC.patch \ - file://boost-math-disable-pch-for-gcc.patch \ -" diff --git a/meta/recipes-support/boost/boost_1.62.0.bb b/meta/recipes-support/boost/boost_1.62.0.bb new file mode 100644 index 0000000000..120d12968b --- /dev/null +++ b/meta/recipes-support/boost/boost_1.62.0.bb @@ -0,0 +1,12 @@ +include boost-${PV}.inc +include boost.inc + +SRC_URI += "\ + file://arm-intrinsics.patch \ + file://consider-hardfp.patch \ + file://boost-CVE-2012-2677.patch \ + file://0001-boost-asio-detail-socket_types.hpp-fix-poll.h-includ.patch \ + file://0002-boost-test-execution_monitor.hpp-fix-mips-soft-float.patch \ + file://0004-Use-atomic-by-default-when-BOOST_NO_CXX11_HDR_ATOMIC.patch \ + file://boost-math-disable-pch-for-gcc.patch \ +" -- cgit 1.2.3-korg