Merge pull request #1005 from majestrate/staitc-link-2019-12-26

make static linking actually static

Makefile

@@ -45,6 +45,11 @@ SHADOW_OPTS ?=
 LIBUV_VERSION ?= v1.30.1
 LIBUV_PREFIX = $(BUILD_ROOT)/libuv
 
+LIBCURL_PREFIX = $(BUILD_ROOT)/curl
+LIBCURL_VERSION = 7.67.0
+LIBCURL_URL = https://github.com/curl/curl/releases/download/curl-7_67_0/curl-7.67.0.tar.xz
+LIBCURL_SHA256 = f5d2e7320379338c3952dcc7566a140abb49edb575f9f99272455785c40e536c
+
 TESTNET_ROOT=/tmp/lokinet_testnet_tmp
 TESTNET_CONF=$(TESTNET_ROOT)/supervisor.conf
 TESTNET_LOG=$(TESTNET_ROOT)/testnet.log
@@ -212,7 +217,19 @@ $(TEST_EXE): debug
 test: $(TEST_EXE)
 	test x$(CROSS) = xOFF && $(TEST_EXE) || test x$(CROSS) = xON
 
+static-configure: $(LIBUV_PREFIX) $(LIBCURL_PREFIX)
+	(test x$(TOOLCHAIN) = x && $(CONFIG_CMD) -DCMAKE_BUILD_TYPE=Release -DSTATIC_LINK=ON -DRELEASE_MOTTO="$(shell cat motto.txt)" -DCMAKE_C_FLAGS='$(CFLAGS)' -DCMAKE_CXX_FLAGS='$(CXXFLAGS)' -DLIBUV_ROOT='$(LIBUV_PREFIX)' -DLIBCURL_ROOT='$(LIBCURL_PREFIX)' ) || (test x$(TOOLCHAIN) != x && $(CONFIG_CMD) -DCMAKE_BUILD_TYPE=Release -DSTATIC_LINK=ON -DRELEASE_MOTTO="$(shell cat motto.txt)" -DCMAKE_C_FLAGS='$(CFLAGS)' -DCMAKE_CXX_FLAGS='$(CXXFLAGS)' -DLIBUV_ROOT='$(LIBUV_PREFIX)' -DLIBCURL_ROOT='$(LIBCURL_PREFIX)' -DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN) -DNATIVE_BUILD=OFF )
+
+static: static-configure
+	$(MAKE) -C '$(BUILD_ROOT)'
+	cp $(EXE) $(REPO)/lokinet-static
 
+$(LIBCURL_PREFIX):
+	mkdir -p '$(BUILD_ROOT)'
+	wget '$(LIBCURL_URL)' -O '$(BUILD_ROOT)/curl.tar.xz'
+	bash -c 'sha256sum -c <<<"$(LIBCURL_SHA256) $(BUILD_ROOT)/curl.tar.xz"'
+	tar -xJf '$(BUILD_ROOT)/curl.tar.xz' -C '$(BUILD_ROOT)'
+	mv '$(BUILD_ROOT)/curl-$(LIBCURL_VERSION)' '$(LIBCURL_PREFIX)'
 
 $(LIBUV_PREFIX):
 	mkdir -p $(BUILD_ROOT)

cmake/unix.cmake

@@ -22,7 +22,7 @@ if(NOT IOS AND NOT ANDROID AND NOT WIN32)
     set(CURL_LIBRARIES libcurl)
     set(CURL_FOUND TRUE)
   else()
-    find_package(CURL REQUIRED)
+    include(FindCURL)
   endif()
 endif()
 

llarp/CMakeLists.txt

@@ -63,13 +63,12 @@ add_library(${UTIL_LIB} STATIC ${LIB_UTIL_SRC})
 
 add_dependencies(${UTIL_LIB} genversion)
 
-target_include_directories(${UTIL_LIB} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/include)
+target_include_directories(${UTIL_LIB} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/include ${CURL_INCLUDE_DIRS})
 if(ANDROID)
   set(LOG_LIB log)
 endif()
 
-target_link_libraries(${UTIL_LIB} PUBLIC ${CRYPTOGRAPHY_LIB} ${LOG_LIB})
-
+target_link_libraries(${UTIL_LIB} PUBLIC ${CRYPTOGRAPHY_LIB} ${LOG_LIB} ${CURL_LIBRARIES})
 target_link_libraries_system(${UTIL_LIB} absl::synchronization absl::hash absl::container nlohmann_json::nlohmann_json)
 
 # cut back on fluff
@@ -254,7 +253,7 @@ endif()
 
 add_library(${STATIC_LIB} STATIC ${LIB_SRC})
 target_include_directories(${STATIC_LIB} PUBLIC ${CURL_INCLUDE_DIRS})
-target_link_libraries(${STATIC_LIB} PUBLIC cxxopts ${ABYSS_LIB} ${PLATFORM_LIB} ${UTIL_LIB} ${CRYPTOGRAPHY_LIB} ${CURL_LIBRARIES})
+target_link_libraries(${STATIC_LIB} PUBLIC cxxopts ${ABYSS_LIB} ${PLATFORM_LIB} ${UTIL_LIB} ${CRYPTOGRAPHY_LIB})
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
   target_include_directories(${PLATFORM_LIB} SYSTEM PUBLIC /usr/local/include)

readme.md

@@ -93,6 +93,17 @@ alternatively make a debian package with:
 
 this puts the built packages in `../`
 
+
+#### Static Linux
+
+static native optimized:
+
+    $ make static STATIC_LINK=ON
+
+cross compile fully static armhf (rpi 2 and up)
+
+    $ make static STATIC_LINK=ON DOWNLOAD_SODIUM=ON TOOLCHAIN=contrib/cross/armhf.toolchain.cmake
+
 ### MacOS
 
 build: