Only static dependencies (gmp, libsodium) (Chia-Network#86)

* Only include libsodium and gmp static libs
sarvex · Dec 10, 2019 · dbec82f · dbec82f
1 parent 961153f
commit dbec82f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,6 +14,7 @@ set(CMAKE_MODULE_PATH
 	${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules
 )
 
+set(sodium_USE_STATIC_LIBS TRUE)
 find_package(sodium)
 if (SODIUM_FOUND)
   message(STATUS "Found libsodium")
@@ -22,6 +23,7 @@ if (SODIUM_FOUND)
   include_directories(${sodium_INCLUDE_DIR})
 endif()
 
+set(STBIN TRUE)
 find_package(gmp)
 if (GMP_FOUND)
   message(STATUS "Found libgmp")

diff --git a/cmake_modules/Findgmp.cmake b/cmake_modules/Findgmp.cmake
@@ -38,7 +38,7 @@ endif (GMP_INCLUDE_DIR AND GMP_LIBRARIES)
 
 find_path(GMP_INCLUDE_DIR NAMES gmp.h)
 if(STBIN)
-	find_library(GMP_LIBRARIES NAMES libgmp.a gmp)
+	find_library(GMP_LIBRARIES NAMES libgmp.a)
 else(STBIN)
 	find_library(GMP_LIBRARIES NAMES libgmp.so gmp)
 endif(STBIN)

diff --git a/cmake_modules/Findsodium.cmake b/cmake_modules/Findsodium.cmake
@@ -60,7 +60,15 @@ if (UNIX)
                 list(INSERT sodium_PKG_STATIC_LIBRARIES 0 "lib${_libname}.a")
             endif()
         endforeach()
-        list(REMOVE_DUPLICATES sodium_PKG_STATIC_LIBRARIES)
+
+        # If the list is empty, don't remove duplicates
+        if (sodium_PKG_STATIC_LIBRARIES)
+            list(REMOVE_DUPLICATES sodium_PKG_STATIC_LIBRARIES)
+
+            # Remove "sodium" which can pull in dynamic lib
+            list(REMOVE_ITEM sodium_PKG_STATIC_LIBRARIES "sodium")
+        endif()
+
 
         # if pkgconfig for libsodium doesn't provide
         # static lib info, then override PKG_STATIC here..

diff --git a/setup.py b/setup.py
@@ -67,7 +67,7 @@ def build_extension(self, ext):
 
 setup(
     name='blspy',
-    version='0.1.12',
+    version='0.1.13',
     author='Mariano Sorgente',
     author_email='[email protected]',
     description='BLS signatures in c++ (python bindings)',