diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/build-data/arch/ia32.txt | 1 | ||||
| -rw-r--r-- | src/build-data/cc/gcc.txt | 2 | ||||
| -rw-r--r-- | src/build-data/os/beos.txt | 14 | ||||
| -rw-r--r-- | src/build-data/os/haiku.txt | 15 | ||||
| -rw-r--r-- | src/entropy/beos_stats/es_beos.cpp | 2 | ||||
| -rw-r--r-- | src/entropy/beos_stats/info.txt | 4 | ||||
| -rw-r--r-- | src/entropy/dev_random/info.txt | 4 | ||||
| -rw-r--r-- | src/entropy/unix_procs/info.txt | 4 | ||||
| -rw-r--r-- | src/filters/fd_unix/info.txt | 4 |
9 files changed, 24 insertions, 26 deletions
diff --git a/src/build-data/arch/ia32.txt b/src/build-data/arch/ia32.txt index f39526ab3..f21f8a551 100644 --- a/src/build-data/arch/ia32.txt +++ b/src/build-data/arch/ia32.txt @@ -9,6 +9,7 @@ ix86 80x86 i86pc # for Solaris x86pc # for QNX +bepc # for Haiku </aliases> <submodels> diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt index 4751a6a28..3eaa79e01 100644 --- a/src/build-data/cc/gcc.txt +++ b/src/build-data/cc/gcc.txt @@ -35,8 +35,6 @@ aix -> "$(CXX) -shared -fPIC" darwin -> "$(CXX) -dynamiclib -fPIC -install_name $(LIBDIR)/$(SONAME)" hpux -> "$(CXX) -shared -fPIC -Wl,+h,$(SONAME)" solaris -> "$(CXX) -shared -fPIC -Wl,-h,$(SONAME)" -# Gotta use ld directly on BeOS, their GCC is busted -beos -> "ld -shared -h $(SONAME)" </so_link_flags> <mach_opt> diff --git a/src/build-data/os/beos.txt b/src/build-data/os/beos.txt deleted file mode 100644 index 4a16b6326..000000000 --- a/src/build-data/os/beos.txt +++ /dev/null @@ -1,14 +0,0 @@ -os_type beos - -install_root /boot/beos -header_dir ../develop/headers -lib_dir system/lib -doc_dir documentation - -<target_features> -gettimeofday -</target_features> - -<aliases> -haiku -</aliases> diff --git a/src/build-data/os/haiku.txt b/src/build-data/os/haiku.txt new file mode 100644 index 000000000..8e35e76eb --- /dev/null +++ b/src/build-data/os/haiku.txt @@ -0,0 +1,15 @@ +os_type unix + +install_root /boot +header_dir develop/headers +lib_dir system/lib +doc_dir system/documentation + +<target_features> +gettimeofday +gmtime_r +</target_features> + +<aliases> +beos +</aliases> 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 diff --git a/src/filters/fd_unix/info.txt b/src/filters/fd_unix/info.txt index 9c3d0acbc..d636035f0 100644 --- a/src/filters/fd_unix/info.txt +++ b/src/filters/fd_unix/info.txt @@ -4,11 +4,11 @@ load_on auto <os> aix -beos cygwin darwin -freebsd dragonfly +freebsd +haiku hpux irix linux |