diff --git a/packages/devel/boost/meta b/packages/devel/boost/meta index b9588e4ccb..8fb4929559 100644 --- a/packages/devel/boost/meta +++ b/packages/devel/boost/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="boost" -PKG_VERSION="1_49_0" +PKG_VERSION="1_50_0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/packages/devel/boost/patches/boost-1_49_0-fix-deprecated-swp.patch b/packages/devel/boost/patches/boost-1_49_0-fix-deprecated-swp.patch deleted file mode 100644 index de5888d737..0000000000 --- a/packages/devel/boost/patches/boost-1_49_0-fix-deprecated-swp.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 8d1ba081260f98d879759433a9d7248d6bd98966 Mon Sep 17 00:00:00 2001 -From: Peter Dimov -Date: Mon, 12 Mar 2012 17:31:21 +0000 -Subject: [PATCH] Apply patch from #5331. Refs #5331. - -SVN-Revision: 77315 ---- - boost/smart_ptr/detail/spinlock_gcc_arm.hpp | 29 +++++++++++++++++++++++++-- - 1 file changed, 27 insertions(+), 2 deletions(-) - -diff --git a/boost/smart_ptr/detail/spinlock_gcc_arm.hpp b/boost/smart_ptr/detail/spinlock_gcc_arm.hpp -index f58ea44..f1bbaf6 100644 ---- a/boost/smart_ptr/detail/spinlock_gcc_arm.hpp -+++ b/boost/smart_ptr/detail/spinlock_gcc_arm.hpp -@@ -43,13 +43,38 @@ class spinlock - { - int r; - -+#if defined(__ARM_ARCH_6__) \ -+ || defined(__ARM_ARCH_6J__) \ -+ || defined(__ARM_ARCH_6K__) \ -+ || defined(__ARM_ARCH_6Z__) \ -+ || defined(__ARM_ARCH_6ZK__) \ -+ || defined(__ARM_ARCH_6T2__) \ -+ || defined(__ARM_ARCH_7__) \ -+ || defined(__ARM_ARCH_7A__) \ -+ || defined(__ARM_ARCH_7R__) \ -+ || defined(__ARM_ARCH_7M__) \ -+ || defined(__ARM_ARCH_7EM__) -+ -+ __asm__ __volatile__( -+ "ldrex %0, [%2]; \n" -+ "cmp %0, %1; \n" -+ "strexne %0, %1, [%2]; \n" -+ BOOST_SP_ARM_BARRIER : -+ "=&r"( r ): // outputs -+ "r"( 1 ), "r"( &v_ ): // inputs -+ "memory", "cc" ); -+ -+#else -+ - __asm__ __volatile__( -- "swp %0, %1, [%2]\n\t" -- BOOST_SP_ARM_BARRIER : -+ "swp %0, %1, [%2];\n" -+ BOOST_SP_ARM_BARRIER : - "=&r"( r ): // outputs - "r"( 1 ), "r"( &v_ ): // inputs - "memory", "cc" ); - -+#endif -+ - return r == 0; - } - --- -1.7.10 -