Skip to content

Commit 3eca540

Browse files
Merge pull request #302 from truemedian/openssl-no-module
fix: add `no-module` to openssl static build
2 parents 12c8642 + 85d7d7b commit 3eca540

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313

1414
- name: Ensure dependencies are installed
1515
run: |
16+
sudo apt-get update
1617
sudo apt-get install -y libssl-dev libpcre2-dev zlib1g-dev lua-luv-dev libluajit-5.1-dev luajit
1718
1819
- name: Configure
@@ -95,6 +96,7 @@ jobs:
9596
- name: Setup QEMU
9697
if: matrix.arch == 'aarch64'
9798
run: |
99+
sudo apt-get update
98100
sudo apt-get install -y qemu-user-static
99101
100102
- name: Build

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ if (MINGW)
1818
add_compile_options(-Wno-error=incompatible-pointer-types)
1919
endif ()
2020

21+
if (CMAKE_C_COMPILER_ID MATCHES "Clang|GNU")
22+
add_compile_options(-Wno-incompatible-pointer-types)
23+
endif()
24+
2125
if (UNIX)
2226
add_compile_options(-Wall)
2327
endif ()

deps/openssl.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ else (WithSharedOpenSSL)
1313
OUTPUT_STRIP_TRAILING_WHITESPACE
1414
)
1515

16-
set(OPENSSL_CONFIG_OPTIONS no-tests no-shared no-pinshared no-makedepend --prefix=${CMAKE_BINARY_DIR})
16+
set(OPENSSL_CONFIG_OPTIONS no-tests no-module no-shared no-pinshared no-makedepend --prefix=${CMAKE_BINARY_DIR})
1717
if (OPENSSL_CONFIG_DIR)
1818
message("Using existing OpenSSL configuration directory: ${OPENSSL_CONFIG_DIR}")
1919
set(OPENSSL_CONFIG_OPTIONS ${OPENSSL_CONFIG_OPTIONS} --openssldir=${OPENSSL_CONFIG_DIR})

0 commit comments

Comments
 (0)