From 6801c508a826b4e75293edd687d1e8ed31140374 Mon Sep 17 00:00:00 2001
From: David Hewitt <1939362+davidhewitt@users.noreply.github.com>
Date: Fri, 13 Oct 2023 08:25:36 +0200
Subject: [PATCH] keep emscripten back on 3.11 for now

---
 .github/workflows/ci.yml  |  3 +++
 emscripten/Makefile       | 13 ++++++-------
 emscripten/pybuilddir.txt |  1 +
 noxfile.py                |  1 -
 4 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 emscripten/pybuilddir.txt

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 279cf277..7b7a2e6b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -339,6 +339,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
+        with:
+          # TODO bump emscripten builds to test on 3.12
+          python-version: 3.11
         id: setup-python
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable
diff --git a/emscripten/Makefile b/emscripten/Makefile
index 5420603e..af224854 100644
--- a/emscripten/Makefile
+++ b/emscripten/Makefile
@@ -2,10 +2,9 @@ CURDIR=$(abspath .)
 
 # These three are passed in from nox.
 BUILDROOT ?= $(CURDIR)/builddir
-PYMAJORMINORMICRO ?= 3.12.0
-PYTHON ?= python3.12
+PYMAJORMINORMICRO ?= 3.11.0
 
-EMSCRIPTEN_VERSION=3.1.46
+EMSCRIPTEN_VERSION=3.1.13
 
 export EMSDKDIR = $(BUILDROOT)/emsdk
 
@@ -35,7 +34,7 @@ PYTHONLIBDIR=$(BUILDROOT)/install/Python-$(PYVERSION)/lib
 
 all: $(PYTHONLIBDIR)/libpython$(PYMAJORMINOR).a
 
-$(BUILDROOT)/.exists:
+$(BUILDROOT)/.exists: 
 	mkdir -p $(BUILDROOT)
 	touch $@
 
@@ -67,18 +66,18 @@ $(PYTHONBUILD)/Makefile: $(PYTHONBUILD)/.patched $(BUILDROOT)/emsdk
 		--build=$(shell $(PYTHONBUILD)/config.guess) \
 		--with-emscripten-target=browser \
 		--enable-wasm-dynamic-linking \
-		--with-build-python=$(PYTHON)
+		--with-build-python=python3.11
 
 $(PYTHONLIBDIR)/libpython$(PYMAJORMINOR).a : $(PYTHONBUILD)/Makefile
 	cd $(PYTHONBUILD) && \
 		emmake make -j3 libpython$(PYMAJORMINOR).a
 
 	# 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
 
 	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
 	find $(PYTHONBUILD) -name '*.a' -exec cp {} $(PYTHONLIBDIR) \;
 	# Install Python stdlib
diff --git a/emscripten/pybuilddir.txt b/emscripten/pybuilddir.txt
new file mode 100644
index 00000000..59f2a4a7
--- /dev/null
+++ b/emscripten/pybuilddir.txt
@@ -0,0 +1 @@
+build/lib.linux-x86_64-3.11
\ No newline at end of file
diff --git a/noxfile.py b/noxfile.py
index 0fec8f81..ee24a26f 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -289,7 +289,6 @@ def test_emscripten(session: nox.Session):
             f"-C link-arg=-lpython{info.pymajorminor}",
             "-C link-arg=-lexpat",
             "-C link-arg=-lmpdec",
-            "-C link-arg=-lHacl_Hash_SHA2",
             "-C link-arg=-lz",
             "-C link-arg=-lbz2",
             "-C link-arg=-sALLOW_MEMORY_GROWTH=1",