ios embedded lokinet for ci pipeine

.drone.jsonnet

@@ -279,6 +279,33 @@ local mac_builder(name,
   ],
 };
 
+// iphone builder
+local iphone_builder(name,
+                     build_type='Release',
+                     werror=true,
+                     cmake_extra='',
+                     extra_cmds=[],
+                     jobs=6,
+                     allow_fail=false) = {
+  kind: 'pipeline',
+  type: 'exec',
+  name: name,
+  platform: { os: 'darwin', arch: 'amd64' },
+  steps: [
+    { name: 'submodules', commands: submodule_commands },
+    {
+      name: 'build',
+      environment: { SSH_KEY: { from_secret: 'SSH_KEY' } },
+      commands: [
+        'echo "Building on ${DRONE_STAGE_MACHINE}"',
+        'export CMAKE_BUILD_PARALLEL_LEVEL=6',
+        'ulimit -n 1024',  // because macos sets ulimit to 256 for some reason yeah idk
+        './contrib/ios.sh ' + ci_mirror_opts,
+      ] + extra_cmds,
+    },
+  ],
+};
+
 local docs_pipeline(name, image, extra_cmds=[], allow_fail=false) = {
   kind: 'pipeline',
   type: 'docker',
@@ -402,6 +429,10 @@ local docs_pipeline(name, image, extra_cmds=[], allow_fail=false) = {
   deb_builder(docker_base + 'ubuntu-jammy-builder', 'jammy', 'ubuntu/jammy'),
   deb_builder(docker_base + 'debian-sid-builder', 'sid', 'debian/sid', arch='arm64'),
 
+  // iphone builds:
+  iphone_builder('iOS (embedded lokinet)', build_type='Debug', extra_cmds=[
+    'UPLOAD_OS=iphone ./contrib/ci/drone-static-upload.sh',
+  ]),
   // Macos builds:
   mac_builder('macOS (Release)'),
   mac_builder('macOS (Debug)', build_type='Debug'),

.gitmodules

@@ -36,3 +36,9 @@
 [submodule "external/oxen-encoding"]
 	path = external/oxen-encoding
 	url = https://github.com/oxen-io/oxen-encoding.git
+[submodule "external/libuv"]
+	path = external/libuv
+	url = https://github.com/libuv/libuv
+[submodule "external/ios-cmake"]
+	path = external/ios-cmake
+	url = https://github.com/leetal/ios-cmake

CMakeLists.txt

@@ -13,7 +13,9 @@ if(APPLE AND BUILD_DAEMON)
   set(LANGS ${LANGS} OBJC Swift)
 endif()
 
+
 find_program(CCACHE_PROGRAM ccache)
+
 if(CCACHE_PROGRAM)
   foreach(lang ${LANGS})
     if(NOT DEFINED CMAKE_${lang}_COMPILER_LAUNCHER AND NOT CMAKE_${lang}_COMPILER MATCHES ".*/ccache")
@@ -50,7 +52,8 @@ option(USE_AVX2 "enable avx2 code" OFF)
 option(USE_NETNS "enable networking namespace support. Linux only" OFF)
 option(NATIVE_BUILD "optimise for host system and FPU" ON)
 option(EMBEDDED_CFG "optimise for older hardware or embedded systems" OFF)
-option(BUILD_LIBLOKINET "build liblokinet.so" ON)
+option(BUILD_LIBLOKINET "build liblokinet.so" OFF)
+option(BUILD_EMBEDDED_LOKINET "build embedded lokinet" OFF)
 option(XSAN "use sanitiser, if your system has it (requires -DCMAKE_BUILD_TYPE=Debug)" OFF)
 option(USE_JEMALLOC "Link to jemalloc for memory allocations, if found" ON)
 option(TESTNET "testnet build" OFF)
@@ -71,8 +74,10 @@ option(STATIC_LINK "link statically against dependencies" ${BUILD_STATIC_DEPS})
 if(BUILD_STATIC_DEPS AND NOT STATIC_LINK)
   message(FATAL_ERROR "Option BUILD_STATIC_DEPS requires STATIC_LINK to be enabled as well")
 endif()
+
 if(BUILD_STATIC_DEPS)
   set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE)
+  include(cmake/combine_archives.cmake)
   include(StaticBuild)
 endif()
 
@@ -138,6 +143,7 @@ find_package(PkgConfig REQUIRED)
 if(NOT BUILD_STATIC_DEPS)
   pkg_check_modules(LIBUV libuv>=1.18.0 IMPORTED_TARGET)
 endif()
+
 if(LIBUV_FOUND AND NOT BUILD_STATIC_DEPS)
   add_library(libuv INTERFACE)
   target_link_libraries(libuv INTERFACE PkgConfig::LIBUV)
@@ -197,23 +203,32 @@ if (WOW64_CROSS_COMPILE OR WIN64_CROSS_COMPILE)
   include(cmake/cross_compile.cmake)
 endif()
 
-if(NOT APPLE)
-  if(NATIVE_BUILD)
-    if(CMAKE_SYSTEM_PROCESSOR STREQUAL ppc64le)
-      add_compile_options(-mcpu=native -mtune=native)
-    else()
-      add_compile_options(-march=native -mtune=native)
-    endif()
-  elseif(NOT NON_PC_TARGET)
-    if (USE_AVX2)
-      add_compile_options(-march=haswell -mtune=haswell -mfpmath=sse)
-    else()
-      # Public binary releases
-      add_compile_options(-march=nocona -mtune=haswell -mfpmath=sse)
-    endif()
+if(APPLE)
+  if(IOS AND ARCH STREQUAL "arm64")
+    message(STATUS "IOS: Changing arch from arm64 to armv8")
+    add_compile_options(-march=armv8)
+  elseif(IOS AND ARCH STREQUAL "x86_64")
+    message(STATUS "IOS: Changing arch from x86_64 to x86-64")
+    add_compile_options(-march=x86-64)
+  endif()
+endif()
+
+if(NATIVE_BUILD)
+  if(CMAKE_SYSTEM_PROCESSOR STREQUAL ppc64le)
+    add_compile_options(-mcpu=native -mtune=native)
+  else()
+    add_compile_options(-march=native -mtune=native)
+  endif()
+elseif(NOT NON_PC_TARGET)
+  if (USE_AVX2)
+    add_compile_options(-march=haswell -mtune=haswell -mfpmath=sse)
+  else()
+    # Public binary releases
+    add_compile_options(-march=nocona -mtune=haswell -mfpmath=sse)
   endif()
 endif()
 
+
 set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
 set(THREADS_PREFER_PTHREAD_FLAG TRUE)
 find_package(Threads REQUIRED)

cmake/StaticBuild.cmake

@@ -48,20 +48,13 @@ set(ZMQ_SOURCE zeromq-${ZMQ_VERSION}.tar.gz)
 set(ZMQ_HASH SHA512=e198ef9f82d392754caadd547537666d4fba0afd7d027749b3adae450516bcf284d241d4616cad3cb4ad9af8c10373d456de92dc6d115b037941659f141e7c0e
     CACHE STRING "libzmq source hash")
 
-set(LIBUV_VERSION 1.44.1 CACHE STRING "libuv version")
-set(LIBUV_MIRROR ${LOCAL_MIRROR} https://dist.libuv.org/dist/v${LIBUV_VERSION}
-    CACHE STRING "libuv mirror(s)")
-set(LIBUV_SOURCE libuv-v${LIBUV_VERSION}.tar.gz)
-set(LIBUV_HASH SHA512=b4f8944e2c79e3a6a31ded6cccbe4c0eeada50db6bc8a448d7015642795012a4b80ffeef7ca455bb093c59a8950d0e1430566c3c2fa87b73f82699098162d834
-    CACHE STRING "libuv source hash")
-
 set(ZLIB_VERSION 1.2.12 CACHE STRING "zlib version")
 set(ZLIB_MIRROR ${LOCAL_MIRROR} https://zlib.net
     CACHE STRING "zlib mirror(s)")
 set(ZLIB_SOURCE zlib-${ZLIB_VERSION}.tar.gz)
 set(ZLIB_HASH SHA256=91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9
   CACHE STRING "zlib source hash")
-  
+
 set(CURL_VERSION 7.83.1 CACHE STRING "curl version")
 set(CURL_MIRROR ${LOCAL_MIRROR} https://curl.haxx.se/download https://curl.askapache.com
   CACHE STRING "curl mirror(s)")
@@ -105,15 +98,25 @@ function(add_static_target target ext_target libname)
 endfunction()
 
 
-
 set(cross_host "")
 set(cross_rc "")
+
 if(CMAKE_CROSSCOMPILING)
-  set(cross_host "--host=${ARCH_TRIPLET}")
-  if (ARCH_TRIPLET MATCHES mingw AND CMAKE_RC_COMPILER)
-    set(cross_rc "WINDRES=${CMAKE_RC_COMPILER}")
+  if(APPLE_TARGET_TRIPLE)
+    if(PLATFORM MATCHES "OS64" OR PLATFORM MATCHES "SIMULATORARM64")
+      set(APPLE_TARGET_TRIPLE aarch64-apple-ios)
+    elseif(PLATFORM MATCHES "SIMULATOR64")
+      set(APPLE_TARGET_TRIPLE x86_64-apple-ios)
+    endif()
+    set(cross_host "--host=${APPLE_TARGET_TRIPLE}")
+  else()
+    set(cross_host "--host=${ARCH_TRIPLET}")
+    if (ARCH_TRIPLET MATCHES mingw AND CMAKE_RC_COMPILER)
+      set(cross_rc "WINDRES=${CMAKE_RC_COMPILER}")
+    endif()
   endif()
 endif()
+
 if(ANDROID)
   set(android_toolchain_suffix linux-android)
   set(android_compiler_suffix linux-android23)
@@ -162,19 +165,25 @@ if(WITH_LTO)
   set(deps_CFLAGS "${deps_CFLAGS} -flto")
 endif()
 
-if(APPLE)
-  set(deps_CFLAGS "${deps_CFLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
-  set(deps_CXXFLAGS "${deps_CXXFLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
-endif()
-
-
 if("${CMAKE_GENERATOR}" STREQUAL "Unix Makefiles")
   set(_make $(MAKE))
 else()
   set(_make make)
 endif()
 
 
+if(APPLE)
+  foreach(lang C CXX)
+    string(APPEND deps_${lang}FLAGS " ${CMAKE_${lang}_SYSROOT_FLAG} ${CMAKE_OSX_SYSROOT} ${CMAKE_${lang}_OSX_DEPLOYMENT_TARGET_FLAG}${CMAKE_OSX_DEPLOYMENT_TARGET}")
+    set(deps_noarch_${lang}FLAGS "${deps_${lang}FLAGS}")
+    foreach(arch ${CMAKE_OSX_ARCHITECTURES})
+      string(APPEND deps_${lang}FLAGS " -arch ${arch}")
+    endforeach()
+  endforeach()
+endif()
+
+
+
 # Builds a target; takes the target name (e.g. "readline") and builds it in an external project with
 # target name suffixed with `_external`.  Its upper-case value is used to get the download details
 # (from the variables set above).  The following options are supported and passed through to
@@ -214,16 +223,6 @@ function(build_external target)
   )
 endfunction()
 
-build_external(libuv
-  CONFIGURE_COMMAND ./autogen.sh && ./configure ${cross_host} ${cross_rc} --prefix=${DEPS_DESTDIR} --with-pic --disable-shared --enable-static "CC=${deps_cc}" "CFLAGS=${deps_CFLAGS}"
-  BUILD_BYPRODUCTS
-    ${DEPS_DESTDIR}/lib/libuv.a
-    ${DEPS_DESTDIR}/include/uv.h
-  )
-add_static_target(libuv libuv_external libuv.a)
-target_link_libraries(libuv INTERFACE ${CMAKE_DL_LIBS})
-
-
 build_external(zlib
   CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env "CC=${deps_cc}" "CFLAGS=${deps_CFLAGS} -fPIC" ${cross_extra} ./configure --prefix=${DEPS_DESTDIR} --static
   BUILD_BYPRODUCTS
@@ -243,6 +242,15 @@ if(CMAKE_CROSSCOMPILING)
   elseif(ANDROID)
     set(openssl_system_env SYSTEM=Linux MACHINE=${android_machine} LD=${deps_ld} RANLIB=${deps_ranlib} AR=${deps_ar})
     set(openssl_extra_opts no-asm)
+  elseif(IOS)
+    get_filename_component(apple_toolchain "${CMAKE_C_COMPILER}" DIRECTORY)
+    get_filename_component(apple_sdk "${CMAKE_OSX_SYSROOT}" NAME)
+    if(NOT ${apple_toolchain} MATCHES Xcode OR NOT ${apple_sdk} MATCHES "iPhone(OS|Simulator)")
+      message(FATAL_ERROR "didn't find your toolchain and sdk correctly from ${CMAKE_C_COMPILER}/${CMAKE_OSX_SYSROOT}: found toolchain=${apple_toolchain}, sdk=${apple_sdk}")
+    endif()
+    set(openssl_system_env CROSS_COMPILE=${apple_toolchain}/ CROSS_TOP=${CMAKE_DEVELOPER_ROOT}/ CROSS_SDK=${apple_sdk}/)
+    set(openssl_configure_command ./Configure iphoneos-cross)
+    set(openssl_cc "clang")
   elseif(ARCH_TRIPLET STREQUAL mips64-linux-gnuabi64)
     set(openssl_system_env SYSTEM=Linux MACHINE=mips64)
     set(openssl_configure_command ./Configure linux64-mips64)
@@ -265,12 +273,11 @@ elseif(CMAKE_C_FLAGS MATCHES "-march=armv7")
   set(openssl_system_env SYSTEM=Linux MACHINE=armv7)
 endif()
 
-
 build_external(openssl
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env CC=${deps_cc} ${openssl_system_env} ${openssl_configure_command}
-    --prefix=${DEPS_DESTDIR} ${openssl_extra_opts} no-shared no-capieng no-dso no-dtls1 no-ec_nistp_64_gcc_128 no-gost
-    no-heartbeats no-md2 no-rc5 no-rdrand no-rfc3779 no-sctp no-ssl-trace no-ssl2 no-ssl3
-    no-static-engine no-tests no-weak-ssl-ciphers no-zlib no-zlib-dynamic "CFLAGS=${deps_CFLAGS}"
+  CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env CC=${openssl_cc} ${openssl_system_env} ${openssl_configure_command}
+  --prefix=${DEPS_DESTDIR} ${openssl_extra_opts} no-shared no-capieng no-dso no-dtls1 no-ec_nistp_64_gcc_128 no-gost
+  no-heartbeats no-md2 no-rc5 no-rdrand no-rfc3779 no-sctp no-ssl-trace no-ssl2 no-ssl3
+  no-static-engine no-tests no-weak-ssl-ciphers no-zlib-dynamic "CFLAGS=${deps_CFLAGS}"
   INSTALL_COMMAND ${_make} install_sw
   BUILD_BYPRODUCTS
     ${DEPS_DESTDIR}/lib/libssl.a ${DEPS_DESTDIR}/lib/libcrypto.a
@@ -281,7 +288,6 @@ add_static_target(OpenSSL::Crypto openssl_external libcrypto.a)
 if(WIN32)
   target_link_libraries(OpenSSL::Crypto INTERFACE "ws2_32;crypt32;iphlpapi")
 endif()
-
 set(OPENSSL_INCLUDE_DIR ${DEPS_DESTDIR}/include)
 set(OPENSSL_CRYPTO_LIBRARY ${DEPS_DESTDIR}/lib/libcrypto.a ${DEPS_DESTDIR}/lib/libssl.a)
 set(OPENSSL_VERSION 1.1.1)
@@ -294,13 +300,19 @@ build_external(expat
 )
 add_static_target(expat expat_external libexpat.a)
 
+
+set(unbound_extra)
+if(APPLE AND IOS)
+  set(unbound_extra CPP=cpp)
+endif()
+
 build_external(unbound
   DEPENDS openssl_external expat_external
   CONFIGURE_COMMAND ./configure ${cross_host} ${cross_rc} --prefix=${DEPS_DESTDIR} --disable-shared
-  --enable-static --with-libunbound-only --with-pic
+  --enable-static --with-libunbound-only --with-pic --disable-gost
   --$<IF:$<BOOL:${WITH_LTO}>,enable,disable>-flto --with-ssl=${DEPS_DESTDIR}
   --with-libexpat=${DEPS_DESTDIR}
-  "CC=${deps_cc}" "CFLAGS=${deps_CFLAGS}"
+  "CC=${deps_cc}" "CFLAGS=${deps_CFLAGS}" ${unbound_extra}
 )
 add_static_target(libunbound unbound_external libunbound.a)
 if(NOT WIN32)
@@ -315,7 +327,10 @@ build_external(sodium CONFIGURE_COMMAND ./configure ${cross_host} ${cross_rc} --
           --enable-static --with-pic "CC=${deps_cc}" "CFLAGS=${deps_CFLAGS}")
 add_static_target(sodium sodium_external libsodium.a)
 
-build_external(sqlite3)
+build_external(sqlite3 CONFIGURE_COMMAND ./configure ${cross_host} ${cross_rc} --prefix=${DEPS_DESTDIR} --enable-static --disable-shared --disable-readline --with-pic "CC=${deps_cc}" "CFLAGS=${deps_CFLAGS}"
+  BUILD_COMMAND true
+  INSTALL_COMMAND make install-includeHEADERS install-libLTLIBRARIES)
+
 add_static_target(sqlite3 sqlite3_external libsqlite3.a)
 
 
@@ -331,10 +346,16 @@ if(CMAKE_CROSSCOMPILING AND ARCH_TRIPLET MATCHES mingw)
     PATCH_COMMAND ${PROJECT_SOURCE_DIR}/contrib/apply-patches.sh ${PROJECT_SOURCE_DIR}/contrib/patches/libzmq-mingw-wepoll.patch ${PROJECT_SOURCE_DIR}/contrib/patches/libzmq-mingw-closesocket.patch)
 endif()
 
+set(zmq_cross_host "${cross_host}")
+if(IOS AND cross_host MATCHES "-ios$")
+  # zmq doesn't like "-ios" for the host, so replace it with -darwin
+  string(REGEX REPLACE "-ios$" "-darwin" zmq_cross_host ${cross_host})
+endif()
+
 build_external(zmq
   DEPENDS sodium_external
   ${zmq_patch}
-  CONFIGURE_COMMAND ./configure ${cross_host} --prefix=${DEPS_DESTDIR} --enable-static --disable-shared
+  CONFIGURE_COMMAND ./configure ${zmq_cross_host} --prefix=${DEPS_DESTDIR} --enable-static --disable-shared
     --disable-curve-keygen --enable-curve --disable-drafts --disable-libunwind --with-libsodium
     --without-pgm --without-norm --without-vmci --without-docs --with-pic --disable-Werror --disable-libbsd ${zmq_extra}
     "CC=${deps_cc}" "CXX=${deps_cxx}" "CFLAGS=${deps_CFLAGS} -fstack-protector" "CXXFLAGS=${deps_CXXFLAGS} -fstack-protector"

cmake/combine_archives.cmake

@@ -0,0 +1,30 @@
+function(combine_archives output_archive)
+  set(FULL_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/lib${output_archive}.a)
+  set(output_archive_dummy_file ${CMAKE_CURRENT_BINARY_DIR}/${output_archive}.dummy.cpp)
+  add_custom_command(OUTPUT ${output_archive_dummy_file}
+                     COMMAND touch ${output_archive_dummy_file}
+                     DEPENDS ${ARGN})
+  add_library(${output_archive} STATIC EXCLUDE_FROM_ALL ${output_archive_dummy_file})
+
+  if(NOT APPLE)
+    set(mri_file ${CMAKE_CURRENT_BINARY_DIR}/${output_archive}.mri)
+    set(mri_content "create ${FULL_OUTPUT_PATH}\n")
+    foreach(in_archive ${ARGN})
+        string(APPEND mri_content "addlib $<TARGET_FILE:${in_archive}>\n")
+    endforeach()
+    string(APPEND mri_content "save\nend\n")
+    file(GENERATE OUTPUT ${mri_file} CONTENT "${mri_content}")
+
+    add_custom_command(TARGET ${output_archive}
+                       POST_BUILD
+                       COMMAND ar -M < ${mri_file})
+  else()
+    set(merge_libs)
+    foreach(in_archive ${ARGN})
+      list(APPEND merge_libs $<TARGET_FILE:${in_archive}>)
+    endforeach()
+    add_custom_command(TARGET ${output_archive}
+                       POST_BUILD
+                       COMMAND /usr/bin/libtool -static -o ${FULL_OUTPUT_PATH} ${merge_libs})
+  endif()
+endfunction(combine_archives)

contrib/android-configure.sh

@@ -37,7 +37,9 @@ for abi in $build_abis; do
         -DWITH_SYSTEMD=OFF \
         -DFORCE_OXENMQ_SUBMODULE=ON \
         -DFORCE_OXENC_SUBMODULE=ON \
-        -DSUBMODULE_CHECK=OFF \
+        -DFORCE_NLOHMANN_SUBMODULE=ON \
+        -DFORCE_LIBUV_SUBMODULE=ON \
+        -DSUBMODULE_CHECK=ON \
         -DWITH_LTO=OFF \
         -DCMAKE_BUILD_TYPE=Release \
         $@ $root

contrib/ci/drone-static-upload.sh

@@ -47,6 +47,9 @@ elif [ -e build-docs ]; then
     archive="$base.tar.xz"
     cp -av build-docs/docs/mkdocs.yml build-docs/docs/markdown "$base"
     tar cJvf "$archive" "$base"
+elif [ -e build/iphone/ ]; then
+    archive="$base.tar.xz"
+    mv build/iphone/*.tar.xz "$archive"
 else
     cp -av daemon/lokinet daemon/lokinet-vpn "$base"
     cp -av ../contrib/bootstrap/mainnet.signed "$base/bootstrap.signed"

contrib/cross.sh

@@ -25,7 +25,10 @@ cmake_opts="-DBUILD_STATIC_DEPS=ON \
           -DSTATIC_LINK=ON \
           -DWITH_SYSTEMD=OFF \
           -DFORCE_OXENMQ_SUBMODULE=ON \
-          -DSUBMODULE_CHECK=OFF \
+          -DFORCE_OXENC_SUBMODULE=ON \
+          -DFORCE_NLOHMANN_SUBMODULE=ON \
+          -DFORCE_LIBUV_SUBMODULE=ON \
+          -DSUBMODULE_CHECK=ON \
           -DWITH_LTO=OFF \
           -DWITH_BOOTSTRAP=OFF \
           -DCMAKE_BUILD_TYPE=RelWithDeb"