Add hashing libs for more platforms

Add hashing libs for FreeBSD, ARM, and 32-bit macOS/Windows.
pogodevorg · Nov 12, 2016 · 6fe1d97 · 6fe1d97
1 parent ceb8dd5
commit 6fe1d97
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 15 deletions.
diff --git a/pgoapi/lib/libniantichash-freebsd-i386.so b/pgoapi/lib/libniantichash-freebsd-i386.so
diff --git a/pgoapi/lib/libniantichash-freebsd-x86-64.so b/pgoapi/lib/libniantichash-freebsd-x86-64.so
diff --git a/pgoapi/lib/libniantichash-linux-arm32.so b/pgoapi/lib/libniantichash-linux-arm32.so
diff --git a/pgoapi/lib/libniantichash-linux-arm64.so b/pgoapi/lib/libniantichash-linux-arm64.so
diff --git a/pgoapi/lib/libniantichash-linux-i386.so b/pgoapi/lib/libniantichash-linux-i386.so
diff --git a/pgoapi/lib/libniantichash-macos-i386.dylib b/pgoapi/lib/libniantichash-macos-i386.dylib
diff --git a/pgoapi/lib/libniantichash-windows-i686.dll b/pgoapi/lib/libniantichash-windows-i686.dll
diff --git a/pgoapi/utilities.py b/pgoapi/utilities.py
@@ -172,30 +172,31 @@ def long_to_bytes(val, endianness='big'):
 def get_hash_lib_path():
     # win32 doesn't mean necessarily 32 bits
     hash_lib = None
+    arch = platform.architecture()[0]
     if sys.platform == "win32" or sys.platform == "cygwin":
-        if platform.architecture()[0] == '64bit':
+        if arch == '64bit':
             hash_lib = "libniantichash-windows-x86-64.dll"
         else:
-            hash_lib = "libniantichash-windows-i386.dll"
+            hash_lib = "libniantichash-windows-i686.dll"
     elif sys.platform == "darwin":
-        hash_lib = "libniantichash-macos-x86-64.dylib"
-    elif os.uname()[4].startswith("arm") and platform.architecture()[0] == '32bit':
+        if arch == '64bit':
+            hash_lib = "libniantichash-macos-x86-64.dylib"
+        else:
+            hash_lib = "libniantichash-macos-i386.dylib"
+    elif os.uname()[4].startswith("arm") and arch == '32bit':
         hash_lib = "libniantichash-linux-arm-32.so"
-    elif os.uname()[4].startswith("aarch64") and platform.architecture()[0] == '64bit':
+    elif os.uname()[4].startswith("aarch64") and arch == '64bit':
         hash_lib = "libniantichash-linux-arm-64.so"
     elif sys.platform.startswith('linux'):
-        if "centos" in platform.platform():
-            if platform.architecture()[0] == '64bit':
-                hash_lib = "libniantichash-centos-x86-64.so"
-            else:
-                hash_lib = "libniantichash-centos-i386.so"
+        if platform.architecture()[0] == '64bit':
+            hash_lib = "libniantichash-linux-x86-64.so"
         else:
-            if platform.architecture()[0] == '64bit':
-                hash_lib = "libniantichash-linux-x86-64.so"
-            else:
-                hash_lib = "libniantichash-linux-i386.so"
+            hash_lib = "libniantichash-linux-i386.so"
     elif sys.platform.startswith('freebsd'):
-        hash_lib = "libniantichash-freebsd-x86-64.so"
+        if arch == '64bit':
+            hash_lib = "libniantichash-freebsd-x86-64.so"
+        else:
+            hash_lib = "libniantichash-freebsd-i386.so"
     else:
         err = "Unexpected/unsupported platform '{}'".format(sys.platform)
         log.error(err)