diff options
| author | Chris "Koying" Browet <cbro@semperpax.com> | 2014-01-21 12:16:57 +0100 |
|---|---|---|
| committer | Chris "Koying" Browet <cbro@semperpax.com> | 2014-01-21 15:29:38 +0100 |
| commit | ab8c024bea1b5721398c6b738af38d455f128b86 (patch) | |
| tree | b3c7cf25e16cfb79021f42f774c538b2e6dd59b2 /tools | |
| parent | f0dc3495c8a72c1811120f3f060d0742848cad86 (diff) | |
FIX: [depends]: boost: actually enable spinlock for shared_ptr multithread on arm
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/target/boost/Makefile | 5 | ||||
| -rw-r--r-- | tools/depends/target/boost/fix_shared_ptr_multithread.patch | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/tools/depends/target/boost/Makefile b/tools/depends/target/boost/Makefile index f79a6d736b..e46d57cc82 100644 --- a/tools/depends/target/boost/Makefile +++ b/tools/depends/target/boost/Makefile @@ -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 index 0000000000..695dc754fc --- /dev/null +++ b/tools/depends/target/boost/fix_shared_ptr_multithread.patch @@ -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 |