Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Boost 1.45 from V2 on Linux and OS X

Browse Source
This commit is contained in:
Siana Gearz
2011-06-09 15:04:10 +02:00
parent 630059a74f
commit 41a910d1b5
3 changed files with 6 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
LICENSES/boost-coroutine-linden.patch
View File

@@ -1,62 +0,0 @@
diff -rc ../boost-coroutine/boost/coroutine/coroutine.hpp boost-coroutine/boost/coroutine/coroutine.hpp
*** ../boost-coroutine/boost/coroutine/coroutine.hpp Wed Apr 29 14:41:05 2009
--- boost-coroutine/boost/coroutine/coroutine.hpp Wed Apr 22 09:35:22 2009
***************
*** 28,33 ****
--- 28,36 ----
#ifndef BOOST_COROUTINE_COROUTINE_HPP_20060512
#define BOOST_COROUTINE_COROUTINE_HPP_20060512
+ // On Linux systems, use native swapcontext() et al. rather than
+ // Boost.Coroutine homebrew assembler
+ #define BOOST_COROUTINE_NO_ASM
// default_context_impl.hpp must be first for weird Apple bug
#include <boost/coroutine/detail/default_context_impl.hpp>
#include <cstddef>
diff -rc ../boost-coroutine/boost/coroutine/future.hpp boost-coroutine/boost/coroutine/future.hpp
*** ../boost-coroutine/boost/coroutine/future.hpp Wed Apr 29 14:41:05 2009
--- boost-coroutine/boost/coroutine/future.hpp Wed Apr 22 09:35:26 2009
***************
*** 33,38 ****
--- 33,41 ----
#ifndef BOOST_COROUTINE_WAIT_MAX
#define BOOST_COROUTINE_WAIT_MAX 10
#endif
+ // On Linux systems, use native swapcontext() et al. rather than
+ // Boost.Coroutine homebrew assembler
+ #define BOOST_COROUTINE_NO_ASM
// default_context_impl.hpp must be first for weird Apple bug
#include <boost/coroutine/detail/default_context_impl.hpp>
#include <boost/none.hpp>
diff -u -r old/boost/coroutine/detail/coroutine_impl.hpp new/boost/coroutine/detail/coroutine_impl.hpp
--- old/boost/coroutine/detail/coroutine_impl.hpp 2009-10-20 17:10:02.000000000 +0100
+++ new/boost/coroutine/detail/coroutine_impl.hpp 2009-10-20 19:22:11.000000000 +0100
@@ -56,7 +56,7 @@
typedef ContextImpl context_impl;
typedef CoroutineType coroutine_type;
typedef coroutine_impl<coroutine_type, context_impl> type;
- typedef context_base<context_impl> context_base;
+ typedef context_base<context_impl> context_base_type;
typedef typename coroutine_type::arg_slot_type arg_slot_type;
typedef typename coroutine_type::result_type result_type;
typedef typename coroutine_type::result_slot_type result_slot_type;
@@ -65,7 +65,7 @@
template<typename DerivedType>
coroutine_impl(DerivedType * this_, std::ptrdiff_t stack_size) :
- context_base(*this_, stack_size),
+ context_base_type(*this_, stack_size),
m_arg(0),
m_result(0){}
diff -u -r old/boost/coroutine/detail/posix_utility.hpp new/boost/coroutine/detail/posix_utility.hpp
--- old/boost/coroutine/detail/posix_utility.hpp 2009-04-24 21:30:44.000000000 +0100
+++ new/boost/coroutine/detail/posix_utility.hpp 2009-10-20 19:21:27.000000000 +0100
@@ -39,6 +39,7 @@
#include <cstddef>
#include <cstdlib>
#include <iostream>
+#include <cstring>
#include <boost/type_traits.hpp>
#if defined(_POSIX_MAPPED_FILES) && _POSIX_MAPPED_FILES > 0
#include <sys/mman.h>

4
indra/cmake/Boost.cmake
View File

@@ -47,13 +47,13 @@ else (STANDALONE)
set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
set(BOOST_REGEX_LIBRARY boost_regex-mt)
set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
# set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
set(BOOST_SYSTEM_LIBRARY boost_system-mt)
elseif (LINUX)
set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
set(BOOST_REGEX_LIBRARY boost_regex-mt)
set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
# set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
set(BOOST_SYSTEM_LIBRARY boost_system-mt)
endif (WINDOWS)
endif (STANDALONE)

8
install.xml
View File

@@ -193,16 +193,16 @@
<key>darwin</key>
<map>
<key>md5sum</key>
<string>bb8552f22769da81593f7d47a51d83d8</string>
<string>2cad51575b429be4fdadb5d63da1c739</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-darwin-20100226.tar.bz2</uri>
<uri>https:/github.com/siana/SingularityViewer/boost-1.45.0-darwin-20110604.tar.bz2</uri>
</map>
<key>linux</key>
<map>
<key>md5sum</key>
<string>4db3d74e40d149eeec06f4d97a609bb1</string>
<string>a2d2fff5cc5555ffd9865daedfcd0dd5</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-linux-20100624.tar.bz2</uri>
<uri>https:/github.com/siana/SingularityViewer/boost-1.45.0-linux-20110604.tar.bz2</uri>
</map>
<key>windows</key>
<map>