cmake: enable openssl assembly optimizations for all builds

luvit · Jul 12, 2023 · b11cc94 · b11cc94
1 parent 2b82230
commit b11cc94
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -134,6 +134,9 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Prepare NASM
+        uses: ilammy/setup-nasm@v1
+
       - name: Configure
         run: ./make ${{ matrix.build_type }}
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -65,7 +65,7 @@ option(WithSharedLibluv "Shared or Static libluv" OFF)
 option(WithSharedLibuv "Shared or Static libuv" OFF)
 option(WithSharedLua "Shared or Static Lua" OFF)
 option(WithOpenSSL "Include OpenSSL" OFF)
-option(WithOpenSSLASM "Enable Assembly Optimizations" OFF)
+option(WithOpenSSLASM "Enable Assembly Optimizations" ON)
 option(WithSharedOpenSSL "Shared or Static OpenSSL" OFF)
 option(WithPCRE "Include PCRE" OFF)
 option(WithSharedPCRE "Shared or Static PCRE" OFF)

diff --git a/Makefile b/Makefile
@@ -20,7 +20,6 @@ WITH_LPEG ?= ON
 WITH_ZLIB ?= OFF
 
 WITH_SHARED_OPENSSL ?= OFF
-WITH_OPENSSL_ASM ?= OFF
 WITH_SHARED_PCRE ?= OFF
 WITH_SHARED_LPEG ?= OFF
 WITH_SHARED_ZLIB ?= OFF

diff --git a/packaging/test.lua b/packaging/test.lua
@@ -1,5 +1,5 @@
 -- This runs `make regular` with all possible combinations of defines and checks if it succeeds
--- This is currently 3888 invocations
+-- This is currently 2916 invocations
 --
 -- This script expects:
 -- - an environment that can build luvi using the Makefile
@@ -43,7 +43,6 @@ addDefineToMatrix("WITH_LPEG", {"ON", "OFF"})
 addDefineToMatrix("WITH_ZLIB", {"ON", "OFF"})
 
 addDefineToMatrix("WITH_SHARED_OPENSSL", {"ON", "OFF"}, "WITH_OPENSSL=ON")
-addDefineToMatrix("WITH_OPENSSL_ASM", {"ON", "OFF"}, "WITH_SHARED_OPENSSL=OFF")
 addDefineToMatrix("WITH_SHARED_PCRE", {"ON", "OFF"}, "WITH_PCRE=ON")
 addDefineToMatrix("WITH_SHARED_ZLIB", {"ON", "OFF"}, "WITH_ZLIB=ON")