aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorMatt Corallo <matt@bluematt.me>2012-03-25 16:17:39 -0400
committerMatt Corallo <matt@bluematt.me>2012-06-15 17:19:09 +0200
commit1d42878adb5809218b1f329221ef46121674cb1a (patch)
treebcb8a3e781b882061f9c312e999011894402e251 /contrib
parent39471861d59866f7f2abadc27ed139b3eecca236 (diff)
Fix #956 the Boost 1.49 way.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/gitian-descriptors/boost-win32.yml20
-rw-r--r--contrib/gitian-descriptors/gitian-win32.yml4
2 files changed, 20 insertions, 4 deletions
diff --git a/contrib/gitian-descriptors/boost-win32.yml b/contrib/gitian-descriptors/boost-win32.yml
index 2af91d1edb..d9a0bed539 100644
--- a/contrib/gitian-descriptors/boost-win32.yml
+++ b/contrib/gitian-descriptors/boost-win32.yml
@@ -17,6 +17,22 @@ 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
@@ -34,5 +50,5 @@ script: |
cd $TMPDIR
export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
export FAKETIME=$REFERENCE_DATETIME
- zip -r boost-win32-1.49.0-gitian.zip *
- cp boost-win32-1.49.0-gitian.zip $OUTDIR
+ zip -r boost-win32-1.49.0-gitian2.zip *
+ cp boost-win32-1.49.0-gitian2.zip $OUTDIR
diff --git a/contrib/gitian-descriptors/gitian-win32.yml b/contrib/gitian-descriptors/gitian-win32.yml
index 21b03b3873..6e2eff15f3 100644
--- a/contrib/gitian-descriptors/gitian-win32.yml
+++ b/contrib/gitian-descriptors/gitian-win32.yml
@@ -16,7 +16,7 @@ remotes:
"dir": "bitcoin"
files:
- "qt-win32-4.7.4-gitian.zip"
-- "boost-win32-1.49.0-gitian.zip"
+- "boost-win32-1.49.0-gitian2.zip"
- "bitcoin-deps-0.0.4.zip"
script: |
#
@@ -29,7 +29,7 @@ script: |
mkdir boost_1_49_0
cd boost_1_49_0
mkdir -p stage/lib
- unzip ../boost-win32-1.49.0-gitian.zip
+ unzip ../boost-win32-1.49.0-gitian2.zip
cd bin/$GBUILD_BITS
for lib in *; do
i586-mingw32msvc-ar rc ../../stage/lib/libboost_${lib}-mt-s.a $lib/*.o