aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorlloyd <[email protected]>2014-12-17 23:48:20 +0000
committerlloyd <[email protected]>2014-12-17 23:48:20 +0000
commit4db8ae79680f3f5b65fcd5f69528d5be97b279ed (patch)
tree5f9fcb842f1ba791fc10064d06aeac4476f5c45f /src
parentdad6b7c94067b2d571ee9ef187a2a370b1b1e16a (diff)
Add MinGW support for the CryptoAPI RNG. Also disable the dependencies
in auto_rng for a working entropy source as in situations where it doesn't work almost none of the library builds. Disable boost by default from the library. Github issue 34. Unrelated - remove long dead Tru64 as a target.
Diffstat (limited to 'src')
-rw-r--r--src/build-data/os/tru64.txt9
-rw-r--r--src/lib/entropy/cryptoapi_rng/info.txt1
-rw-r--r--src/lib/rng/auto_rng/info.txt2
-rw-r--r--src/lib/utils/boost/info.txt1
4 files changed, 3 insertions, 10 deletions
diff --git a/src/build-data/os/tru64.txt b/src/build-data/os/tru64.txt
deleted file mode 100644
index a442743bc..000000000
--- a/src/build-data/os/tru64.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-os_type unix
-
-<target_features>
-gettimeofday
-</target_features>
-
-<aliases>
-osf1
-</aliases>
diff --git a/src/lib/entropy/cryptoapi_rng/info.txt b/src/lib/entropy/cryptoapi_rng/info.txt
index d4ee13aea..ea4bc96f0 100644
--- a/src/lib/entropy/cryptoapi_rng/info.txt
+++ b/src/lib/entropy/cryptoapi_rng/info.txt
@@ -17,4 +17,5 @@ cygwin
<libs>
windows -> advapi32.lib
+mingw -> advapi32.lib
</libs>
diff --git a/src/lib/rng/auto_rng/info.txt b/src/lib/rng/auto_rng/info.txt
index a72120a88..4f48f484b 100644
--- a/src/lib/rng/auto_rng/info.txt
+++ b/src/lib/rng/auto_rng/info.txt
@@ -5,5 +5,5 @@ hmac_rng
hmac
sha2_32
sha2_64
-dev_random|cryptoapi_rng|unix_procs|proc_walk
+#dev_random|cryptoapi_rng|unix_procs|proc_walk
</requires>
diff --git a/src/lib/utils/boost/info.txt b/src/lib/utils/boost/info.txt
index e87fd5b88..119a54175 100644
--- a/src/lib/utils/boost/info.txt
+++ b/src/lib/utils/boost/info.txt
@@ -5,3 +5,4 @@ define BOOST_ASIO 20131228
all -> boost_system,boost_filesystem
</libs>
+load_on request