boost: update to 1.67, hack out an compile issue with arm

5 files changed, 57 insertions, 9 deletions

diff --git a/package/boost/Makefile b/package/boost/Makefile
index 1e23479ff..2add96f5e 100644
--- a/package/boost/Makefile
+++ b/package/boost/Makefile
@@ -4,10 +4,10 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		boost
-PKG_VERSION:=		1.66.0
-PKG_EXTRAVER:=		1_66
+PKG_VERSION:=		1.67.0
+PKG_EXTRAVER:=		1_67
 PKG_RELEASE:=		1
-PKG_HASH:=		bd0df411efd9a585e5a2212275f8762079fed8842264954675a4fddc46cfcf60
+PKG_HASH:=		8aa4e330c870ef50a896634c931adf468b21f8a69b77007e45c444151229f665
 PKG_DESCR:=		portable c++ library
 PKG_SECTION:=		libs/misc
 PKG_BUILDDEP:=		python2-host
diff --git a/package/boost/patches/patch-boost_atomic_detail_caps_gcc_atomic_hpp b/package/boost/patches/patch-boost_atomic_detail_caps_gcc_atomic_hpp
index 74c1c43cb..c9ec14ebb 100644
--- a/package/boost/patches/patch-boost_atomic_detail_caps_gcc_atomic_hpp
+++ b/package/boost/patches/patch-boost_atomic_detail_caps_gcc_atomic_hpp
@@ -1,6 +1,6 @@
---- boost_1_57_0.orig/boost/atomic/detail/caps_gcc_atomic.hpp	2014-10-01 04:30:37.000000000 -0500
-+++ boost_1_57_0/boost/atomic/detail/caps_gcc_atomic.hpp	2015-05-12 17:26:04.821955497 -0500
-@@ -128,7 +128,7 @@
+--- boost_1_67_0.orig/boost/atomic/detail/caps_gcc_atomic.hpp	2018-04-11 15:49:00.000000000 +0200
++++ boost_1_67_0/boost/atomic/detail/caps_gcc_atomic.hpp	2018-05-14 05:53:50.064807243 +0200
+@@ -127,7 +127,7 @@
  #define BOOST_ATOMIC_CHAR32_T_LOCK_FREE BOOST_ATOMIC_INT32_LOCK_FREE
  #define BOOST_ATOMIC_CHAR16_T_LOCK_FREE BOOST_ATOMIC_INT16_LOCK_FREE
  
diff --git a/package/boost/patches/patch-boost_config_platform_linux_hpp b/package/boost/patches/patch-boost_config_platform_linux_hpp
index a32f07c4e..4035fafa0 100644
--- a/package/boost/patches/patch-boost_config_platform_linux_hpp
+++ b/package/boost/patches/patch-boost_config_platform_linux_hpp
@@ -1,6 +1,6 @@
---- boost_1_61_0.orig/boost/config/platform/linux.hpp	2016-05-05 23:11:02.000000000 +0200
-+++ boost_1_61_0/boost/config/platform/linux.hpp	2016-06-09 23:47:13.099272614 +0200
-@@ -46,6 +46,13 @@
+--- boost_1_67_0.orig/boost/config/platform/linux.hpp	2018-04-11 15:49:01.000000000 +0200
++++ boost_1_67_0/boost/config/platform/linux.hpp	2018-05-14 05:53:50.072807086 +0200
+@@ -47,6 +47,13 @@
  
  #endif
  
diff --git a/package/boost/patches/patch-libs_context_src_asm_jump_arm_aapcs_elf_gas_S b/package/boost/patches/patch-libs_context_src_asm_jump_arm_aapcs_elf_gas_S
new file mode 100644
index 000000000..dfbf217a8
--- /dev/null
+++ b/package/boost/patches/patch-libs_context_src_asm_jump_arm_aapcs_elf_gas_S
@@ -0,0 +1,24 @@
+--- boost_1_67_0.orig/libs/context/src/asm/jump_arm_aapcs_elf_gas.S	2018-04-11 15:49:01.000000000 +0200
++++ boost_1_67_0/libs/context/src/asm/jump_arm_aapcs_elf_gas.S	2018-05-14 06:53:04.847209932 +0200
+@@ -50,10 +50,6 @@ jump_fcontext:
+ 
+     @ prepare stack for FPU
+     sub  sp, sp, #64
+-#if (defined(__VFP_FP__) && !defined(__SOFTFP__))
+-    @ save S16-S31
+-    vstmia sp, {d8-d15}
+-#endif
+ 
+     @ store RSP (pointing to context-data) in A1
+     mov  a1, sp
+@@ -61,10 +57,6 @@ jump_fcontext:
+     @ restore RSP (pointing to context-data) from A2
+     mov  sp, a2
+ 
+-#if (defined(__VFP_FP__) && !defined(__SOFTFP__))
+-    @ restore S16-S31
+-    vldmia  sp, {d8-d15}
+-#endif
+     @ prepare stack for FPU
+     add  sp, sp, #64
+ 
diff --git a/package/boost/patches/patch-libs_context_src_asm_ontop_arm_aapcs_elf_gas_S b/package/boost/patches/patch-libs_context_src_asm_ontop_arm_aapcs_elf_gas_S
new file mode 100644
index 000000000..c54038510
--- /dev/null
+++ b/package/boost/patches/patch-libs_context_src_asm_ontop_arm_aapcs_elf_gas_S
@@ -0,0 +1,24 @@
+--- boost_1_67_0.orig/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S	2018-04-11 15:49:01.000000000 +0200
++++ boost_1_67_0/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S	2018-05-14 06:30:06.658068445 +0200
+@@ -50,10 +50,6 @@ ontop_fcontext:
+ 
+     @ prepare stack for FPU
+     sub  sp, sp, #64
+-#if (defined(__VFP_FP__) && !defined(__SOFTFP__))
+-    @ save S16-S31
+-    vstmia sp, {d8-d15}
+-#endif
+ 
+     @ store RSP (pointing to context-data) in A1
+     mov  a1, sp
+@@ -64,10 +60,6 @@ ontop_fcontext:
+     @ store parent context in A2
+     mov  a2, a1
+ 
+-#if (defined(__VFP_FP__) && !defined(__SOFTFP__))
+-    @ restore S16-S31
+-    vldmia  sp, {d8-d15}
+-#endif
+     @ prepare stack for FPU
+     add  sp, sp, #64
+