Skip to content

liblzma #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DerThorsten merged 2 commits into from
Jan 20, 2025
Merged

liblzma #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8426203
liblzma
DerThorsten Jan 20, 2025
382b869
option
DerThorsten Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ option(WITH_NODE_TESTS "With node tests" OFF)
option(LINK_LIBEXPAT "Link libexpat" OFF)
option(LINK_LIBMPDEC "Link libmpdec" OFF)

option(LINK_LIBLZMA "Link liblzma" OFF)

# set PY_VERSION to 3.11 if the user has not set it
if (NOT DEFINED PY_VERSION)
set(PY_VERSION 3.11)
Expand Down Expand Up @@ -154,6 +156,10 @@ SET(PYTHON_UTIL_LIBS
${CMAKE_INSTALL_PREFIX}/lib/libcrypto.a
)

if(LINK_LIBLZMA)
SET(PYTHON_UTIL_LIBS ${PYTHON_UTIL_LIBS} ${CMAKE_INSTALL_PREFIX}/lib/liblzma.a)
endif()


if (LINK_LIBEXPAT)
SET(PYTHON_UTIL_LIBS ${PYTHON_UTIL_LIBS} ${CMAKE_INSTALL_PREFIX}/lib/libexpat.a)
Expand Down
3 changes: 2 additions & 1 deletion build_mkdocs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ if [ ! -d "$WASM_ENV_PREFIX" ]; then
--yes \
python=$PYTHON_VERSION "pybind11" nlohmann_json pybind11_json numpy \
bzip2 sqlite zlib zstd libffi exceptiongroup\
"xeus" "xeus-lite" xeus-python "xeus-javascript" xtl "ipython=8.22.2=py311had7285e_1" "traitlets>=5.14.2" openssl
"xeus" "xeus-lite" xeus-python "xeus-javascript" xtl "ipython=8.22.2=py311had7285e_1" "traitlets>=5.14.2" \
openssl

else
echo "Wasm env $WASM_ENV_NAME already exists"
Expand Down
3 changes: 3 additions & 0 deletions tests/tests/test_pyjs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
if sys.version_info[0] == 3 and sys.version_info[1] >= 13:
def test_ssl_import():
import ssl

def test_import_lzma():
import lzma

def test_js_submodule():
from pyjs.js import Function
Expand Down
Loading