Use cmake-ports for building libsodium using Zig

Author: kasperisager

.github/workflows/prebuild.yml

@@ -60,7 +60,11 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: lts/*
-      - run: choco install llvm --version 21.1.8 --force
+      - run: sudo snap install zig --classic --beta
+        if: ${{ matrix.platform == 'linux' || matrix.platform == 'android' }}
+      - run: brew install zig
+        if: ${{ matrix.platform == 'darwin' || matrix.platform == 'ios' }}
+      - run: choco install zig
         if: ${{ matrix.platform == 'win32' }}
       - run: npm install -g bare-make
       - run: npm install

.github/workflows/test.yml

@@ -27,11 +27,15 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: lts/*
-      - run: choco install llvm --version 21.1.8 --force
+      - run: sudo snap install zig --classic --beta
+        if: ${{ matrix.platform == 'linux' }}
+      - run: brew install zig
+        if: ${{ matrix.platform == 'darwin' }}
+      - run: choco install zig
         if: ${{ matrix.platform == 'win32' }}
       - run: npm install -g bare-runtime bare-make
       - run: npm install
-      - run: bare-make generate --platform ${{ matrix.platform }} --arch ${{ matrix.arch }} --debug
+      - run: bare-make generate --platform ${{ matrix.platform }} --arch ${{ matrix.arch }}
       - run: bare-make build
       - run: bare-make install
       - run: npm test

CMakeLists.txt

@@ -1,213 +1,15 @@
-cmake_minimum_required(VERSION 3.25)
+cmake_minimum_required(VERSION 3.31)
 
 find_package(cmake-bare REQUIRED PATHS node_modules/cmake-bare)
-find_package(cmake-fetch REQUIRED PATHS node_modules/cmake-fetch)
 find_package(cmake-napi REQUIRED PATHS node_modules/cmake-napi)
 find_package(cmake-npm REQUIRED PATHS node_modules/cmake-npm)
+find_package(cmake-ports REQUIRED PATHS node_modules/cmake-ports)
 
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-
-project(sodium_native C ASM CXX)
-
-fetch_package("github:jedisct1/libsodium#e18eee6" SOURCE_DIR sodium)
+project(sodium_native C CXX ASM)
 
 fetch_package("github:holepunchto/libjstl#098664c")
 
-bare_target(target)
-
-if(target MATCHES "win32")
-  add_compile_options(/MT$<$<CONFIG:Debug>:d>)
-endif()
-
-file(COPY_FILE "${sodium}/builds/msvc/version.h" "${sodium}/src/libsodium/include/sodium/version.h")
-
-file(GLOB_RECURSE sodium_headers CONFIGURE_DEPENDS "${sodium}/src/libsodium/**/*.h")
-file(GLOB_RECURSE sodium_sources CONFIGURE_DEPENDS "${sodium}/src/libsodium/**/*.c")
-file(GLOB_RECURSE sodium_asm_sources CONFIGURE_DEPENDS "${sodium}/src/libsodium/**/*.S")
-
-add_library(sodium OBJECT)
-
-target_sources(
-  sodium
-  INTERFACE
-    ${sodium_headers}
-  PRIVATE
-    ${sodium_sources}
-)
-
-target_include_directories(
-  sodium
-  INTERFACE
-    "${sodium}/src/libsodium/include"
-  PRIVATE
-    "${sodium}/src/libsodium/include/sodium"
-)
-
-if(NOT target MATCHES "win32")
-  target_compile_options(
-    sodium
-    PRIVATE
-      -fvisibility=hidden
-      -fno-strict-aliasing
-      -fwrapv
-      -flax-vector-conversions
-  )
-endif()
-
-target_compile_definitions(
-  sodium
-  PUBLIC
-    SODIUM_STATIC=1
-  PRIVATE
-    _GNU_SOURCE=1
-    CONFIGURED=1
-    DEV_MODE=1
-    HAVE_ATOMIC_OPS=1
-    HAVE_C11_MEMORY_FENCES=1
-    HAVE_CET_H=1
-    HAVE_GCC_MEMORY_FENCES=1
-    HAVE_INLINE_ASM=1
-    HAVE_INTTYPES_H=1
-    HAVE_STDINT_H=1
-    HAVE_TI_MODE=1
-)
-
-if(target MATCHES "darwin|ios")
-  target_compile_definitions(
-    sodium
-    PRIVATE
-      ASM_HIDE_SYMBOL=.private_extern
-      TLS=_Thread_local
-      HAVE_ARC4RANDOM=1
-      HAVE_ARC4RANDOM_BUF=1
-      HAVE_CATCHABLE_ABRT=1
-      HAVE_CATCHABLE_SEGV=1
-      HAVE_CLOCK_GETTIME=1
-      HAVE_GETPID=1
-      HAVE_MADVISE=1
-      HAVE_MEMSET_S=1
-      HAVE_MLOCK=1
-      HAVE_MMAP=1
-      HAVE_MPROTECT=1
-      HAVE_NANOSLEEP=1
-      HAVE_POSIX_MEMALIGN=1
-      HAVE_PTHREAD=1
-      HAVE_PTHREAD_PRIO_INHERIT=1
-      HAVE_RAISE=1
-      HAVE_SYSCONF=1
-      HAVE_SYS_MMAN_H=1
-      HAVE_SYS_PARAM_H=1
-      HAVE_WEAK_SYMBOLS=1
-  )
-
-  if(NOT target MATCHES "ios")
-    target_compile_definitions(
-      sodium
-      PRIVATE
-        HAVE_GETENTROPY=1
-        HAVE_SYS_RANDOM_H=1
-    )
-  endif()
-endif()
-
-if(target MATCHES "linux")
-  target_compile_definitions(
-    sodium
-    PRIVATE
-      ASM_HIDE_SYMBOL=.hidden
-      TLS=_Thread_local
-      HAVE_CATCHABLE_ABRT=1
-      HAVE_CATCHABLE_SEGV=1
-      HAVE_CLOCK_GETTIME=1
-      HAVE_GETPID=1
-      HAVE_MADVISE=1
-      HAVE_MLOCK=1
-      HAVE_MMAP=1
-      HAVE_MPROTECT=1
-      HAVE_NANOSLEEP=1
-      HAVE_POSIX_MEMALIGN=1
-      HAVE_PTHREAD_PRIO_INHERIT=1
-      HAVE_PTHREAD=1
-      HAVE_RAISE=1
-      HAVE_SYSCONF=1
-      HAVE_SYS_AUXV_H=1
-      HAVE_SYS_MMAN_H=1
-      HAVE_SYS_PARAM_H=1
-      HAVE_SYS_RANDOM_H=1
-      HAVE_WEAK_SYMBOLS=1
-  )
-endif()
-
-if(target MATCHES "win32")
-  target_compile_definitions(
-    sodium
-    PRIVATE
-      _CRT_SECURE_NO_WARNINGS=1
-      HAVE_RAISE=1
-  )
-endif()
-
-if(target MATCHES "x64")
-  target_compile_definitions(
-    sodium
-    PRIVATE
-      HAVE_CPUID=1
-      HAVE_RDRAND=1
-      HAVE_EMMINTRIN_H=1 # SSE2
-      HAVE_PMMINTRIN_H=1 # SSE3
-      HAVE_TMMINTRIN_H=1 # SSSE3
-      HAVE_SMMINTRIN_H=1 # SSE4.1
-      HAVE_WMMINTRIN_H=1 # AES
-      HAVE_AVXINTRIN_H=1 # AVX
-      HAVE_AVX2INTRIN_H=1 # AVX2
-      HAVE_AVX512FINTRIN_H # AVX512F
-  )
-
-  if(NOT target MATCHES "win32")
-    target_compile_definitions(
-      sodium
-      PRIVATE
-        HAVE_AMD64_ASM=1
-        HAVE_AVX_ASM=1
-    )
-
-    target_sources(
-      sodium
-      PRIVATE
-        ${sodium_asm_sources}
-    )
-  endif()
-endif()
-
-if(target MATCHES "arm64")
-  target_compile_definitions(
-    sodium
-    PRIVATE
-      HAVE_ARMCRYPTO=1
-  )
-endif()
-
-if(CMAKE_C_BYTE_ORDER MATCHES "BIG_ENDIAN")
-  target_compile_definitions(
-    sodium
-    PRIVATE
-      NATIVE_BIG_ENDIAN=1
-  )
-else()
-  target_compile_definitions(
-    sodium
-    PRIVATE
-      NATIVE_LITTLE_ENDIAN=1
-  )
-endif()
-
-if(target MATCHES "linux|android")
-  target_link_options(
-    sodium
-    PUBLIC
-      -Wl,-z,noexecstack
-  )
-endif()
+find_port(libsodium)
 
 add_library(sodium_extensions OBJECT)
 
@@ -237,7 +39,6 @@ target_sources(
 target_link_libraries(
   ${sodium_native_bare}
   PRIVATE
-    $<TARGET_OBJECTS:sodium>
     $<TARGET_OBJECTS:sodium_extensions>
     jstl
   PUBLIC
@@ -262,7 +63,6 @@ target_compile_definitions(
 target_link_libraries(
   ${sodium_native_node}
   PRIVATE
-    $<TARGET_OBJECTS:sodium>
     $<TARGET_OBJECTS:sodium_extensions>
     jstl
   PUBLIC

binding.cc

@@ -2939,6 +2939,8 @@ sn_crypto_stream_xor_wrap_update(
   auto *c_ptr = c.data();
   auto *m_ptr = m.data();
 
+  if (c_ptr == nullptr) return;
+
   if (state->remainder) {
     uint64_t offset = 0;
     int rem = state->remainder;

cmake/ports/libsodium/patches/01-windows-sys-param.patch

@@ -0,0 +1,12 @@
+diff --git a/build.zig b/build.zig
+index 0ad8c867..a0a27eb9 100644
+--- a/build.zig
++++ b/build.zig
+@@ -59,7 +59,6 @@ fn initLibConfig(b: *std.Build, target: std.Build.ResolvedTarget, lib: *Compile)
+         },
+         .windows => {
+             lib.root_module.addCMacro("HAVE_RAISE", "1");
+-            lib.root_module.addCMacro("HAVE_SYS_PARAM_H", "1");
+             if (lib.isStaticLibrary()) {
+                 lib.root_module.addCMacro("SODIUM_STATIC", "1");
+             }

cmake/ports/libsodium/port.cmake

@@ -0,0 +1,43 @@
+include_guard(GLOBAL)
+
+if(WIN32)
+  set(lib sodium.lib)
+else()
+  set(lib libsodium.a)
+endif()
+
+declare_port(
+  "github:jedisct1/libsodium#a937222"
+  sodium
+  ZIG
+  BYPRODUCTS lib/${lib}
+  ARGS
+    -Dstatic=true
+    -Dshared=false
+    -Dtest=false
+  PATCHES
+    patches/01-windows-sys-param.patch
+)
+
+add_library(sodium STATIC IMPORTED GLOBAL)
+
+add_dependencies(sodium ${sodium})
+
+set_target_properties(
+  sodium
+  PROPERTIES
+  IMPORTED_LOCATION "${sodium_PREFIX}/lib/${lib}"
+)
+
+file(MAKE_DIRECTORY "${sodium_PREFIX}/include")
+
+target_include_directories(
+  sodium
+  INTERFACE "${sodium_PREFIX}/include"
+)
+
+target_compile_definitions(
+  sodium
+  INTERFACE
+    SODIUM_STATIC
+)

package.json

@@ -29,6 +29,7 @@
     "cmake-bare": "^1.6.1",
     "cmake-fetch": "^1.4.3",
     "cmake-napi": "^1.2.1",
+    "cmake-ports": "^1.3.0",
     "prettier": "^3.6.2",
     "prettier-config-holepunch": "^2.0.0"
   },