FIX: [depends]: boost: actually enable spinlock for shared_ptr multithread on arm
authorChris "Koying" Browet <cbro@semperpax.com>
Tue, 21 Jan 2014 11:16:57 +0000 (12:16 +0100)
committerChris "Koying" Browet <cbro@semperpax.com>
Tue, 21 Jan 2014 14:29:38 +0000 (15:29 +0100)
tools/depends/target/boost/Makefile
tools/depends/target/boost/fix_shared_ptr_multithread.patch [new file with mode: 0644]

index f79a6d7..e46d57c 100644 (file)
@@ -1,5 +1,5 @@
 include ../../Makefile.include
-DEPS= ../../Makefile.include add-arm-mem-barrier.patch fix-deprecated-swp.patch Makefile
+DEPS= ../../Makefile.include add-arm-mem-barrier.patch fix-deprecated-swp.patch fix_shared_ptr_multithread.patch Makefile
 
 #Headers Only!
 LIBNAME=boost
@@ -21,6 +21,9 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
        echo '  ;' >> $(PLATFORM)/tools/build/v2/user-config.jam
        cd $(PLATFORM); patch -p1 < ../add-arm-mem-barrier.patch
        cd $(PLATFORM); patch -p1 < ../fix-deprecated-swp.patch
+ifeq (arm, $(findstring arm, $(CPU)))
+       cd $(PLATFORM); patch -p0 < ../fix_shared_ptr_multithread.patch
+endif
        cd $(PLATFORM); ./bootstrap.sh --prefix=$(PREFIX)
 
 .installed-$(PLATFORM): $(PLATFORM)
diff --git a/tools/depends/target/boost/fix_shared_ptr_multithread.patch b/tools/depends/target/boost/fix_shared_ptr_multithread.patch
new file mode 100644 (file)
index 0000000..695dc75
--- /dev/null
@@ -0,0 +1,8 @@
+--- boost/config/user.hpp.orig 2014-01-20 11:45:10.048976867 +0100
++++ boost/config/user.hpp      2014-01-20 11:45:34.244568535 +0100
+@@ -121,4 +121,4 @@
+ // #define BOOST_WHATEVER_NO_LIB
+  
+-
++#define BOOST_SP_USE_SPINLOCK