aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2012-08-24 01:47:02 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2012-08-27 00:49:23 +0000
commit18376965808351aaecb053b503898c629a5f3953 (patch)
tree9d023dcd0fc20563f3e564abdfc50bd562ede312 /contrib
parentbc8d8323354d80cce061d3219d99850adea6a0b4 (diff)
Bugfix: Move boost::interprocess Win32 workaround to Bitcoin-Qt sources, rather than hacking boost in gitian
Diffstat (limited to 'contrib')
-rw-r--r--contrib/gitian-descriptors/boost-win32.yml16
1 files changed, 0 insertions, 16 deletions
diff --git a/contrib/gitian-descriptors/boost-win32.yml b/contrib/gitian-descriptors/boost-win32.yml
index d9a0bed539..c4a9f33100 100644
--- a/contrib/gitian-descriptors/boost-win32.yml
+++ b/contrib/gitian-descriptors/boost-win32.yml
@@ -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