Merge branch 'master' of github.com:kpu/kenlm

aria1991 · Mar 18, 2020 · 7826fc3 · 7826fc3
2 parents 2ce3295 + 0e9be9f
commit 7826fc3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/BUILDING b/BUILDING
@@ -16,3 +16,6 @@ Windows:
 OSX:
   Missing dependencies can be remedied with brew.
   brew install cmake boost eigen
+
+Debian/Ubuntu:
+  sudo apt install build-essential cmake libboost-system-dev libboost-thread-dev libboost-program-options-dev libboost-test-dev libeigen3-dev zlib1g-dev libbz2-dev liblzma-dev
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ I do development in master on https://github.com/kpu/kenlm/.  Normally, it works
 The website https://kheafield.com/code/kenlm/ has more documentation.  If you're a decoder developer, please download the latest version from there instead of copying from another decoder.
 
 ## Compiling
-Use cmake, see [BUILDING](BUILDING) for more detail.
+Use cmake, see [BUILDING](BUILDING) for build dependencies and more detail.
 ```bash
 mkdir -p build
 cd build

diff --git a/util/usage.cc b/util/usage.cc
@@ -38,7 +38,7 @@ typedef WINBOOL (WINAPI *PFN_MS_EX) (lMEMORYSTATUSEX*);
 #include <unistd.h>
 #endif
 
-#if defined(__MACH__) || defined(__FreeBSD__) || defined(__APPLE__)
+#if defined(__MACH__) || defined(__APPLE__)
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #include <mach/task.h>
@@ -170,7 +170,7 @@ double ThreadTime() {
   // GetThreadTimes() reports in units of 100 nanoseconds, i.e. ten-millionths
   // of a second.
   return ticks / (10 * 1000 * 1000);
-#elif defined(__MACH__) || defined(__FreeBSD__) || defined(__APPLE__)
+#elif defined(__MACH__) || defined(__APPLE__)
   struct task_basic_info t_info;
   mach_msg_type_number_t t_info_count = TASK_BASIC_INFO_COUNT;  
   task_info(mach_task_self(), TASK_BASIC_INFO, (task_info_t)&t_info, &t_info_count);