aboutsummaryrefslogtreecommitdiffstats
path: root/src/entropy
diff options
context:
space:
mode:
authorlloyd <[email protected]>2011-04-21 18:48:42 +0000
committerlloyd <[email protected]>2011-04-21 18:48:42 +0000
commit0771ef306eedd46aaa17005044e46ea0c9ac01a4 (patch)
tree0adff17c0c37e3598afea5e34eef894e3caa873b /src/entropy
parentc54c7e7cf74727057dfed6bb19c116e6ac97983b (diff)
Enable unix_procs for FreeBSD. It was disabled in 2006 to work
around a bug in FreeBSD 6.1, which is long EOL. If we can't figure out the CPU in configure.py, if running verbosely dump the entire list of CPUs we know about. Some doc cleanups. Rename the 'beos' target to 'haiku', since testing shows that botan can't compile under the old BeOS GCC 2.95 anyway. Remove the call to idle_time in the stats entropy source - it causes a crash on Haiku R1-alpha2 somewhere inside a system DLL. I didn't bother debugging it beyond looking at the backtrace. Add a 'bepc' alias for i386 as that is what Haiku reports its processor as. Fix the install dirs to match Haiku R1, though apparently they will change in R2 anyway when they add package management. Enable use of gmtime_r on Haiku.
Diffstat (limited to 'src/entropy')
-rw-r--r--src/entropy/beos_stats/es_beos.cpp2
-rw-r--r--src/entropy/beos_stats/info.txt4
-rw-r--r--src/entropy/dev_random/info.txt4
-rw-r--r--src/entropy/unix_procs/info.txt4
4 files changed, 6 insertions, 8 deletions
diff --git a/src/entropy/beos_stats/es_beos.cpp b/src/entropy/beos_stats/es_beos.cpp
index 2b4a7a24f..e514eb121 100644
--- a/src/entropy/beos_stats/es_beos.cpp
+++ b/src/entropy/beos_stats/es_beos.cpp
@@ -26,8 +26,6 @@ void BeOS_EntropySource::poll(Entropy_Accumulator& accum)
get_key_info(&info_key);
accum.add(info_key, 0);
- accum.add(idle_time(), 0);
-
team_info info_team;
int32 cookie_team = 0;
diff --git a/src/entropy/beos_stats/info.txt b/src/entropy/beos_stats/info.txt
index 088b926f9..c7ed9fe5a 100644
--- a/src/entropy/beos_stats/info.txt
+++ b/src/entropy/beos_stats/info.txt
@@ -9,9 +9,9 @@ es_beos.h
</header:internal>
<os>
-beos
+haiku
</os>
<libs>
-beos -> root,be
+haiku -> root,be
</libs>
diff --git a/src/entropy/dev_random/info.txt b/src/entropy/dev_random/info.txt
index cabb47ea2..4c69a57f4 100644
--- a/src/entropy/dev_random/info.txt
+++ b/src/entropy/dev_random/info.txt
@@ -10,11 +10,11 @@ dev_random.h
<os>
aix
-beos
cygwin
darwin
-freebsd
dragonfly
+freebsd
+haiku
hpux
hurd
irix
diff --git a/src/entropy/unix_procs/info.txt b/src/entropy/unix_procs/info.txt
index 2100584e4..d2a15f13d 100644
--- a/src/entropy/unix_procs/info.txt
+++ b/src/entropy/unix_procs/info.txt
@@ -13,10 +13,10 @@ unix_cmd.h
<os>
aix
-beos
cygwin
darwin
-#freebsd
+freebsd
+haiku
hpux
irix
linux