Drop backported 0002-boost-test-execution_monitor.hpp-fix-mips-soft-float.patch
Rebase consider-hardfp.patch to
0001-When-using-soft-float-on-ARM-we-should-not-expect-th.patch
Signed-off-by: Alexander Kanavin
---
...bjam-native_1.62.0.bb => bjam-native_1.63.0.bb} | 0
.../boost/{boost-1.62.0.inc => boost-1.63.0.inc} | 4 +-
...soft-float-on-ARM-we-should-not-expect-th.patch | 29 +
...execution_monitor.hpp-fix-mips-soft-float.patch | 145 -
.../boost/boost/consider-hardfp.patch | 19 ---
.../boost/{boost_1.62.0.bb => boost_1.63.0.bb} | 3 +-
6 files changed, 32 insertions(+), 168 deletions(-)
rename meta/recipes-support/boost/{bjam-native_1.62.0.bb =>
bjam-native_1.63.0.bb} (100%)
rename meta/recipes-support/boost/{boost-1.62.0.inc => boost-1.63.0.inc} (84%)
create mode 100644
meta/recipes-support/boost/boost/0001-When-using-soft-float-on-ARM-we-should-not-expect-th.patch
delete mode 100644
meta/recipes-support/boost/boost/0002-boost-test-execution_monitor.hpp-fix-mips-soft-float.patch
delete mode 100644 meta/recipes-support/boost/boost/consider-hardfp.patch
rename meta/recipes-support/boost/{boost_1.62.0.bb => boost_1.63.0.bb} (82%)
diff --git a/meta/recipes-support/boost/bjam-native_1.62.0.bb
b/meta/recipes-support/boost/bjam-native_1.63.0.bb
similarity index 100%
rename from meta/recipes-support/boost/bjam-native_1.62.0.bb
rename to meta/recipes-support/boost/bjam-native_1.63.0.bb
diff --git a/meta/recipes-support/boost/boost-1.62.0.inc
b/meta/recipes-support/boost/boost-1.63.0.inc
similarity index 84%
rename from meta/recipes-support/boost/boost-1.62.0.inc
rename to meta/recipes-support/boost/boost-1.63.0.inc
index 1138de61f13..1c1563050c3 100644
--- a/meta/recipes-support/boost/boost-1.62.0.inc
+++ b/meta/recipes-support/boost/boost-1.63.0.inc
@@ -13,8 +13,8 @@ BOOST_P = "boost_${BOOST_VER}"
SRC_URI = "${SOURCEFORGE_MIRROR}/project/boost/boost/${PV}/${BOOST_P}.tar.bz2"
-SRC_URI[md5sum] = "5fb94629535c19e48703bdb2b2e9490f"
-SRC_URI[sha256sum] =
"36c96b0f6155c98404091d8ceb48319a28279ca0333fba1ad8611eb90afb2ca0"
+SRC_URI[md5sum] = "1c837ecd990bb022d07e7aab32b09847"
+SRC_URI[sha256sum] =
"beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0"
UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/boost/files/";
diff --git
a/meta/recipes-support/boost/boost/0001-When-using-soft-float-on-ARM-we-should-not-expect-th.patch
b/meta/recipes-support/boost/boost/0001-When-using-soft-float-on-ARM-we-should-not-expect-th.patch
new file mode 100644
index 000..bafd5ce001e
--- /dev/null
+++
b/meta/recipes-support/boost/boost/0001-When-using-soft-float-on-ARM-we-should-not-expect-th.patch
@@ -0,0 +1,29 @@
+From 9ab0914207e6d0e6b75ce12147c54b96478feb64 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin
+Date: Tue, 21 Feb 2017 12:50:35 +0200
+Subject: [PATCH] When using soft-float, on ARM we should not expect the FE_*
+ symbols
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj
+Signed-off-by: Alexander Kanavin
+---
+ boost/test/execution_monitor.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/boost/test/execution_monitor.hpp
b/boost/test/execution_monitor.hpp
+index f53348a..86252d7 100644
+--- a/boost/test/execution_monitor.hpp
b/boost/test/execution_monitor.hpp
+@@ -498,7 +498,7 @@ enum masks {
+
+ 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 = BOOST_FPE_OFF,
+
+ #else /* *** */
+--
+2.11.0
+
diff --git
a/meta/recipes-support/boost/boost/0002-boost-test-execution_monitor.hpp-fix-mips-soft-float.patch
b/meta/recipes-support/boost/boost/0002-boost-test-execution_monitor.hpp-fix-mips-soft-float.patch
deleted file mode 100644
index 569c987336f..000
---
a/meta/recipes-support/boost/boost/0002-boost-test-execution_monitor.hpp-fix-mips-soft-float.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From 5c349a1c391c9ce171a1c80f5164fae764f27dba Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andr=C3=A9=20Draszik?=
-Date: Wed, 24 Aug 2016 20:58:59 +0100
-Subject: [PATCH 2/4] boost/test/execution_monitor.hpp: fix mips soft float
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-gcc.compile.c++
/boost/bin.v2/libs/test/build/gcc-4.3.1/release/threading-multi/execution_monitor.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 -fv
