Try using shared libraries for the pyodide wheel

Author: oscarbenjamin

bin/cibw_before_all_pyodide.sh

@@ -15,11 +15,11 @@ mkdir -p "$WASM_LIBRARY_DIR"
 
 # The Pyodide cibuildwheel environment for building python-flint itself sets
 # include/library flags that reference libgmp/libmpfr/libflint. Those libraries
-# do not exist yet while bootstrapping the static dependencies here, so letting
+# do not exist yet while bootstrapping the shared dependencies here, so letting
 # them leak into configure would break link tests such as "does the C compiler
 # work?" for GMP. Use a minimal environment for the bootstrap step.
+unset CFLAGS
 unset PKG_CONFIG_PATH
 unset LDFLAGS
-export CFLAGS="-fPIC"
 
 "$SCRIPT_DIR/pyodide_build_dependencies.sh" --wasm-library-dir "$WASM_LIBRARY_DIR"

bin/pyodide_build_dependencies.sh

@@ -52,6 +52,10 @@ cd "$WASM_LIBRARY_DIR/src"
 
 source "$SCRIPT_DIR/build_variables.sh"
 
+# Keep these in sync with the pinned Pyodide build environment.
+SIDE_MODULE_CFLAGS="-O2 -g0 -fPIC -fwasm-exceptions -sSUPPORT_LONGJMP"
+SIDE_MODULE_LDFLAGS="-O2 -g0 -sWASM_BIGINT -fwasm-exceptions -sSUPPORT_LONGJMP -sSIDE_MODULE=2"
+
 # Download mirrored copy of source distributions for GMP and MPFR
 
 git clone https://github.com/oscarbenjamin/gmp_mirror.git
@@ -67,11 +71,14 @@ tar -xf mpfr-$MPFRVER.tar.gz
 cd gmp-$GMPVER
 
     emconfigure ./configure \
+        CFLAGS="$SIDE_MODULE_CFLAGS" \
+        LDFLAGS="$SIDE_MODULE_LDFLAGS" \
         --disable-dependency-tracking \
         --host none \
-        --disable-shared \
-        --enable-static \
-        --enable-cxx \
+        --enable-shared=yes \
+        --enable-static=no \
+        --disable-cxx \
+        --disable-assembly \
         --prefix=$WASM_LIBRARY_DIR
 
     emmake make -j $(nproc)
@@ -86,8 +93,11 @@ cd ..
 cd mpfr-$MPFRVER
 
     emconfigure ./configure \
+        CFLAGS="$SIDE_MODULE_CFLAGS" \
+        LDFLAGS="$SIDE_MODULE_LDFLAGS -L$WASM_LIBRARY_DIR/lib" \
         --disable-dependency-tracking \
-        --disable-shared \
+        --enable-shared=yes \
+        --enable-static=no \
         --with-gmp=$WASM_LIBRARY_DIR \
         --prefix=$WASM_LIBRARY_DIR
 
@@ -116,8 +126,12 @@ fi
     ./bootstrap.sh
 
     emconfigure ./configure \
+        CFLAGS="$SIDE_MODULE_CFLAGS" \
+        LDFLAGS="$SIDE_MODULE_LDFLAGS -L$WASM_LIBRARY_DIR/lib" \
         --disable-dependency-tracking \
-        --disable-shared \
+        --enable-shared=yes \
+        --disable-static \
+        --disable-debug \
         --prefix=$WASM_LIBRARY_DIR \
         --with-gmp=$WASM_LIBRARY_DIR \
         --with-mpfr=$WASM_LIBRARY_DIR \

pyproject.toml

@@ -179,26 +179,26 @@ repair-wheel-command = [
 
 [tool.cibuildwheel.pyodide]
 before-all = "bin/cibw_before_all_pyodide.sh"
-before-build = "pip install wheel"
+before-build = "pip install wheel auditwheel-emscripten"
 
 # This needs to be kept in sync with the Pyodide row in
 # .github/workflows/buildwheel.yml. The Pyodide version pins both an
 # Emscripten version and a CPython minor version. The command
 # `pyodide xbuildenv search --all` shows the compatible combinations.
 pyodide-version = "0.28.2"
 
-# GMP, MPFR, and FLINT are built as static libraries for Pyodide.
+# GMP, MPFR, and FLINT are built as shared libraries for Pyodide.
 repair-wheel-command = [
 """python bin/cibw_repair_wheel_licenses.py "{wheel}" \
     --license LGPL-3.0-or-later \
-    --license-file 'wasm-library-dir/src/gmp-*/COPYING:python-flint.libs/gmp-*/COPYING' \
-    --license-file 'wasm-library-dir/src/gmp-*/COPYING.LESSERv3:python-flint.libs/gmp-*/COPYING.LESSERv3' \
-    --license-file 'wasm-library-dir/src/mpfr-*/COPYING:python-flint.libs/mpfr-*/COPYING' \
-    --license-file 'wasm-library-dir/src/mpfr-*/COPYING.LESSER:python-flint.libs/mpfr-*/COPYING.LESSER' \
-    --license-file 'wasm-library-dir/src/flint-*/COPYING:python-flint.libs/flint-*/COPYING' \
-    --license-file 'wasm-library-dir/src/flint-*/COPYING.LESSER:python-flint.libs/flint-*/COPYING.LESSER' \
+    --license-file 'wasm-library-dir/src/gmp-*/COPYING:python_flint.libs/gmp-*/COPYING' \
+    --license-file 'wasm-library-dir/src/gmp-*/COPYING.LESSERv3:python_flint.libs/gmp-*/COPYING.LESSERv3' \
+    --license-file 'wasm-library-dir/src/mpfr-*/COPYING:python_flint.libs/mpfr-*/COPYING' \
+    --license-file 'wasm-library-dir/src/mpfr-*/COPYING.LESSER:python_flint.libs/mpfr-*/COPYING.LESSER' \
+    --license-file 'wasm-library-dir/src/flint-*/COPYING:python_flint.libs/flint-*/COPYING' \
+    --license-file 'wasm-library-dir/src/flint-*/COPYING.LESSER:python_flint.libs/flint-*/COPYING.LESSER' \
 """,
-"cp \"{wheel}\" \"{dest_dir}\"",
+"pyodide auditwheel repair --libdir wasm-library-dir/lib --output-dir {dest_dir} {wheel}",
 ]
 
 [tool.cibuildwheel.pyodide.environment]