adjust Dockerfile, android and wasm builds

neodix42 · Nov 24, 2024 · 8292bcd · 8292bcd
1 parent 8e89b72
commit 8292bcd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/CMake/BuildSECP256K1.cmake b/CMake/BuildSECP256K1.cmake
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
-
 if (NOT SECP256K1_LIBRARY)
 
     set(SECP256K1_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third-party/secp256k1)
@@ -22,7 +20,7 @@ if (NOT SECP256K1_LIBRARY)
       )
     elseif (EMSCRIPTEN)
       set(SECP256K1_BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third-party/secp256k1)
-      set(SECP256K1_LIBRARY ${SECP256K1_BINARY_DIR}/.libs/libsecp256k1.a)
+      set(SECP256K1_LIBRARY ${SECP256K1_BINARY_DIR}/lib/libsecp256k1.a)
       set(SECP256K1_INCLUDE_DIR ${SECP256K1_BINARY_DIR}/include)
       add_custom_command(
           WORKING_DIRECTORY ${SECP256K1_SOURCE_DIR}

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:22.04 AS builder
 RUN apt-get update && \
-        DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential cmake clang openssl libssl-dev zlib1g-dev gperf wget git ninja-build libsecp256k1-dev libsodium-dev libmicrohttpd-dev liblz4-dev pkg-config autoconf automake libtool libjemalloc-dev lsb-release software-properties-common gnupg
+        DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential cmake clang openssl libssl-dev zlib1g-dev gperf wget git ninja-build libsodium-dev libmicrohttpd-dev liblz4-dev pkg-config autoconf automake libtool libjemalloc-dev lsb-release software-properties-common gnupg
 
 RUN wget https://apt.llvm.org/llvm.sh && \
     chmod +x llvm.sh && \
@@ -24,7 +24,7 @@ RUN mkdir build && \
 
 FROM ubuntu:22.04
 RUN apt-get update && \
-    apt-get install -y wget curl libatomic1 openssl libsecp256k1-dev libsodium-dev libmicrohttpd-dev liblz4-dev libjemalloc-dev htop net-tools netcat iptraf-ng jq tcpdump pv plzip && \
+    apt-get install -y wget curl libatomic1 openssl libsodium-dev libmicrohttpd-dev liblz4-dev libjemalloc-dev htop net-tools netcat iptraf-ng jq tcpdump pv plzip && \
     rm -rf /var/lib/apt/lists/*
 
 RUN mkdir -p /var/ton-work/db /var/ton-work/scripts /usr/share/ton/smartcont/ /usr/lib/fift/

diff --git a/example/android/build.sh b/example/android/build.sh
@@ -64,6 +64,7 @@ cmake .. -GNinja \
 -DLZ4_LIBRARIES=${LZ4_LIBRARY} \
 -DSODIUM_INCLUDE_DIR=${SODIUM_INCLUDE_DIR} \
 -DSODIUM_LIBRARY_RELEASE=${SODIUM_LIBRARY_RELEASE} \
+-DSODIUM_USE_STATIC_LIBS=1 \
 -DBLST_LIB=${BLST_LIBRARY} || exit 1
 
 ninja native-lib || exit 1