Split out libsodium build into its own cmake flag

Author: sz3

CMakeLists.txt

@@ -17,7 +17,9 @@ endif()
 if(DEFINED BUILD_PORTABLE_LINUX)
 	# statically link c++/gcc (not libc!!)
 	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -static-libstdc++ -static-libgcc")
+endif()
 
+if(DEFINED BUILD_LIBSODIUM)
 	set(SODIUM_DISABLE_TESTS ON)
 	add_subdirectory(libsodium)
 	include_directories("${libmcleece_proj_SOURCE_DIR}/libsodium/libsodium/src/libsodium/include/")

package-portable-linux.sh

@@ -20,5 +20,5 @@ update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-7 100
 update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-7 100
 
 mkdir build-portable/ && cd build-portable/
-/usr/local/bin/cmake .. -DBUILD_PORTABLE_LINUX=1
+/usr/local/bin/cmake .. -DBUILD_PORTABLE_LINUX=1 -DBUILD_LIBSODIUM=1
 make -j5 install