luxolus
/
pyo3
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keep emscripten back on 3.11 for now

This commit is contained in:
David Hewitt 2023-10-13 08:25:36 +02:00
parent 2b7eb3a05e
commit 6801c508a8
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/ci.yml vendored
View File

@ -339,6 +339,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: actions/setup-python@v4 - uses: actions/setup-python@v4
with:
# TODO bump emscripten builds to test on 3.12
python-version: 3.11
id: setup-python id: setup-python
- name: Install Rust toolchain - name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable uses: dtolnay/rust-toolchain@stable

13
emscripten/Makefile
View File

@ -2,10 +2,9 @@ CURDIR=$(abspath .)
# These three are passed in from nox. # These three are passed in from nox.
BUILDROOT ?= $(CURDIR)/builddir BUILDROOT ?= $(CURDIR)/builddir
PYMAJORMINORMICRO ?= 3.12.0 PYMAJORMINORMICRO ?= 3.11.0
PYTHON ?= python3.12
EMSCRIPTEN_VERSION=3.1.46 EMSCRIPTEN_VERSION=3.1.13
export EMSDKDIR = $(BUILDROOT)/emsdk export EMSDKDIR = $(BUILDROOT)/emsdk
@ -35,7 +34,7 @@ PYTHONLIBDIR=$(BUILDROOT)/install/Python-$(PYVERSION)/lib
all: $(PYTHONLIBDIR)/libpython$(PYMAJORMINOR).a all: $(PYTHONLIBDIR)/libpython$(PYMAJORMINOR).a
$(BUILDROOT)/.exists: $(BUILDROOT)/.exists:
mkdir -p $(BUILDROOT) mkdir -p $(BUILDROOT)
touch $@ touch $@
@ -67,18 +66,18 @@ $(PYTHONBUILD)/Makefile: $(PYTHONBUILD)/.patched $(BUILDROOT)/emsdk
--build=$(shell $(PYTHONBUILD)/config.guess) \ --build=$(shell $(PYTHONBUILD)/config.guess) \
--with-emscripten-target=browser \ --with-emscripten-target=browser \
--enable-wasm-dynamic-linking \ --enable-wasm-dynamic-linking \
--with-build-python=$(PYTHON) --with-build-python=python3.11
$(PYTHONLIBDIR)/libpython$(PYMAJORMINOR).a : $(PYTHONBUILD)/Makefile $(PYTHONLIBDIR)/libpython$(PYMAJORMINOR).a : $(PYTHONBUILD)/Makefile
cd $(PYTHONBUILD) && \ cd $(PYTHONBUILD) && \
emmake make -j3 libpython$(PYMAJORMINOR).a emmake make -j3 libpython$(PYMAJORMINOR).a
# Generate sysconfigdata # Generate sysconfigdata
_PYTHON_SYSCONFIGDATA_NAME=$(SYSCONFIGDATA_NAME) _PYTHON_PROJECT_BASE=$(PYTHONBUILD) $(PYTHON) -m sysconfig --generate-posix-vars _PYTHON_SYSCONFIGDATA_NAME=$(SYSCONFIGDATA_NAME) _PYTHON_PROJECT_BASE=$(PYTHONBUILD) python3.11 -m sysconfig --generate-posix-vars
cp `cat pybuilddir.txt`/$(SYSCONFIGDATA_NAME).py $(PYTHONBUILD)/Lib cp `cat pybuilddir.txt`/$(SYSCONFIGDATA_NAME).py $(PYTHONBUILD)/Lib
mkdir -p $(PYTHONLIBDIR) mkdir -p $(PYTHONLIBDIR)
# Copy libexpat.a, libmpdec.a, and libpython3.12.a # Copy libexpat.a, libmpdec.a, and libpython3.11.a
# In noxfile, we explicitly link libexpat and libmpdec via RUSTFLAGS # In noxfile, we explicitly link libexpat and libmpdec via RUSTFLAGS
find $(PYTHONBUILD) -name '*.a' -exec cp {} $(PYTHONLIBDIR) \; find $(PYTHONBUILD) -name '*.a' -exec cp {} $(PYTHONLIBDIR) \;
# Install Python stdlib # Install Python stdlib

1
emscripten/pybuilddir.txt Normal file
View File

@ -0,0 +1 @@
build/lib.linux-x86_64-3.11

1
noxfile.py
View File

@ -289,7 +289,6 @@ def test_emscripten(session: nox.Session):
f"-C link-arg=-lpython{info.pymajorminor}", f"-C link-arg=-lpython{info.pymajorminor}",
"-C link-arg=-lexpat", "-C link-arg=-lexpat",
"-C link-arg=-lmpdec", "-C link-arg=-lmpdec",
"-C link-arg=-lHacl_Hash_SHA2",
"-C link-arg=-lz", "-C link-arg=-lz",
"-C link-arg=-lbz2", "-C link-arg=-lbz2",
"-C link-arg=-sALLOW_MEMORY_GROWTH=1", "-C link-arg=-sALLOW_MEMORY_GROWTH=1",