mirror of
https://github.com/bitcoin/bitcoin.git
synced 2024-11-20 02:25:40 +01:00
Bugfix: Move boost::interprocess Win32 workaround to Bitcoin-Qt sources, rather than hacking boost in gitian
This commit is contained in:
parent
bc8d832335
commit
1837696580
@ -17,22 +17,6 @@ script: |
|
||||
mkdir -p $TMPDIR/bin/$GBUILD_BITS $TMPDIR/include
|
||||
tar xjf boost_1_49_0.tar.bz2
|
||||
cd boost_1_49_0
|
||||
echo "--- tmp_dir_helpers.orig.hpp 2012-06-10 01:39:25.403268210 +0200
|
||||
+++ tmp_dir_helpers.hpp 2012-06-10 01:41:14.653823479 +0200
|
||||
@@ -19,9 +19,9 @@
|
||||
#include <string>
|
||||
|
||||
#if defined(BOOST_INTERPROCESS_WINDOWS)
|
||||
- //#define BOOST_INTERPROCESS_HAS_WINDOWS_KERNEL_BOOTTIME
|
||||
- //#define BOOST_INTERPROCESS_HAS_KERNEL_BOOTTIME
|
||||
- //#include <boost/interprocess/detail/win32_api.hpp>
|
||||
+ #define BOOST_INTERPROCESS_HAS_WINDOWS_KERNEL_BOOTTIME
|
||||
+ #define BOOST_INTERPROCESS_HAS_KERNEL_BOOTTIME
|
||||
+ #include <boost/interprocess/detail/win32_api.hpp>
|
||||
#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
|
||||
//#include <sys/sysctl.h>
|
||||
//#if defined(CTL_KERN) && defined (KERN_BOOTTIME)" > useboottime.patch
|
||||
patch boost/interprocess/detail/tmp_dir_helpers.hpp useboottime.patch
|
||||
echo "using gcc : 4.4 : i586-mingw32msvc-g++
|
||||
:
|
||||
<rc>i586-mingw32msvc-windres
|
||||
|
@ -2,6 +2,12 @@
|
||||
// Distributed under the MIT/X11 software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#include <boost/version.hpp>
|
||||
#if defined(WIN32) && BOOST_VERSION == 104900
|
||||
#define BOOST_INTERPROCESS_HAS_WINDOWS_KERNEL_BOOTTIME
|
||||
#define BOOST_INTERPROCESS_HAS_KERNEL_BOOTTIME
|
||||
#endif
|
||||
|
||||
#include "qtipcserver.h"
|
||||
#include "guiconstants.h"
|
||||
#include "ui_interface.h"
|
||||
|
Loading…
Reference in New Issue
Block a user