Skip to content

Commit af213a4

Browse files
authored
link openssl libraries (#85)
* openssl * remove souperflous pragma once * ssl everywhere
1 parent d79aa6e commit af213a4

File tree

5 files changed

+16
-4
lines changed

5 files changed

+16
-4
lines changed

.github/workflows/main.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,12 @@ jobs:
5757
-c https://repo.mamba.pm/emscripten-forge \
5858
-c https://repo.mamba.pm/conda-forge \
5959
--yes \
60-
python=${{matrix.python_version}} "pybind11${{matrix.pybind11_version}}" nlohmann_json pybind11_json "numpy<2" "pytest==7.1.1" bzip2 sqlite zlib zstd libffi exceptiongroup emscripten-abi==${{matrix.emsdk_ver}}
60+
python=${{matrix.python_version}} \
61+
"pybind11${{matrix.pybind11_version}}" \
62+
nlohmann_json pybind11_json "numpy<2" \
63+
"pytest==7.1.1" bzip2 sqlite zlib zstd libffi \
64+
exceptiongroup emscripten-abi==${{matrix.emsdk_ver}} \
65+
openssl
6166
6267
6368
mkdir build

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,10 @@ SET(PYTHON_UTIL_LIBS
148148
${CMAKE_INSTALL_PREFIX}/lib/libsqlite3.a
149149
${CMAKE_INSTALL_PREFIX}/lib/libffi.a
150150
${CMAKE_INSTALL_PREFIX}/lib/libzstd.a
151+
# ssl
152+
${CMAKE_INSTALL_PREFIX}/lib/libssl.a
153+
# crypto
154+
${CMAKE_INSTALL_PREFIX}/lib/libcrypto.a
151155
)
152156

153157

build_mkdocs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if [ ! -d "$WASM_ENV_PREFIX" ]; then
2323
--yes \
2424
python=$PYTHON_VERSION "pybind11" nlohmann_json pybind11_json numpy \
2525
bzip2 sqlite zlib zstd libffi exceptiongroup\
26-
"xeus" "xeus-lite" xeus-python "xeus-javascript" xtl "ipython=8.22.2=py311had7285e_1" "traitlets>=5.14.2"
26+
"xeus" "xeus-lite" xeus-python "xeus-javascript" xtl "ipython=8.22.2=py311had7285e_1" "traitlets>=5.14.2" openssl
2727

2828
else
2929
echo "Wasm env $WASM_ENV_NAME already exists"

src/inflate.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// from https://zlib.net/zlib_how.html
22
// and https://windrealm.org/tutorials/decompress-gzip-stream.php
33
// and https://stackoverflow.com/questions/10195343/copy-a-file-in-a-sane-safe-and-efficient-way
4-
#pragma once
54

65
#include <stdio.h>
76
#include <string.h>

tests/tests/test_pyjs.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919

2020
import pyjs
2121

22-
22+
# check python version
23+
if sys.version_info[0] == 3 and sys.version_info[1] >= 13:
24+
def test_ssl_import():
25+
import ssl
26+
2327
def test_js_submodule():
2428
from pyjs.js import Function
2529

0 commit comments

Comments
 (0)