diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2012-07-05 16:38:12 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-07-05 16:38:12 -0400 |
| commit | 50fc02d063e7799fc50da2a43421f001a28541b7 (patch) | |
| tree | c9b8a53b47ce57b1a325bbd1099b0cc8fc1a1cdf /contrib | |
| parent | dab9fa7f919807885bd693c4fa14ed740792c294 (diff) | |
| parent | ad5f29b7437fbdf6b25c4a5823b3dea0ac68b3ff (diff) | |
Merge branch 'uri' of https://github.com/TheBlueMatt/bitcoin
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/gitian-descriptors/boost-win32.yml | 26 | ||||
| -rw-r--r-- | contrib/gitian-descriptors/gitian-win32.yml | 8 |
2 files changed, 25 insertions, 9 deletions
diff --git a/contrib/gitian-descriptors/boost-win32.yml b/contrib/gitian-descriptors/boost-win32.yml index 61ea50e4fe..d9a0bed539 100644 --- a/contrib/gitian-descriptors/boost-win32.yml +++ b/contrib/gitian-descriptors/boost-win32.yml @@ -11,12 +11,28 @@ packages: reference_datetime: "2011-01-30 00:00:00" remotes: [] files: -- "boost_1_47_0.tar.bz2" +- "boost_1_49_0.tar.bz2" script: | TMPDIR="$HOME/tmpdir" mkdir -p $TMPDIR/bin/$GBUILD_BITS $TMPDIR/include - tar xjf boost_1_47_0.tar.bz2 - cd boost_1_47_0 + 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.47.0-gitian.zip * - cp boost-win32-1.47.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 9752626d6a..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.47.0-gitian.zip" +- "boost-win32-1.49.0-gitian2.zip" - "bitcoin-deps-0.0.4.zip" script: | # @@ -26,10 +26,10 @@ script: | cd $HOME/build/ export PATH=$PATH:$HOME/qt/bin/ # - mkdir boost_1_47_0 - cd boost_1_47_0 + mkdir boost_1_49_0 + cd boost_1_49_0 mkdir -p stage/lib - unzip ../boost-win32-1.47.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 |