build/bin/sage-dist-helpers (sdh_setup_bdist_wheel): New

sagemath · Dec 5, 2020 · c5a14a3 · c5a14a3
1 parent a3077c7
commit c5a14a3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/build/bin/sage-dist-helpers b/build/bin/sage-dist-helpers
@@ -200,6 +200,14 @@ sdh_make_install() {
         sdh_die "Error installing $PKG_NAME"
 }
 
+sdh_setup_bdist_wheel() {
+    mkdir -p dist
+    rm -f dist/*.whl
+    BDIST_DIR="$(mktemp -d)"
+    sage-python23 setup.py --no-user-cfg \
+         bdist_wheel --bdist-dir "$BDIST_DIR" \
+         "$@" || sdh_die "Error building a wheel for $PKG_NAME"
+}
 
 sdh_pip_install() {
     echo "Installing $PKG_NAME"

diff --git a/build/pkgs/pillow/spkg-install.in b/build/pkgs/pillow/spkg-install.in
@@ -18,10 +18,7 @@ if [ "$CONDA_PREFIX" != "" ]; then
 fi
 
 # Note: Avoid shared libraries inside egg files, Trac #19467
-sage-python23 setup.py \
-       --no-user-cfg \
-       bdist_wheel \
-       --bdist-dir "$(mktemp -d)" \
+sdh_setup_bdist_wheel \
        build_ext \
        --debug \
        --disable-jpeg \

diff --git a/src/doc/en/developer/packaging.rst b/src/doc/en/developer/packaging.rst
@@ -371,6 +371,10 @@ begin with ``sdh_``, which stands for "Sage-distribution helper".
    arguments. If ``$SAGE_DESTDIR`` is not set then the command is run
    with ``$SAGE_SUDO``, if set.
 
+- ``sdh_setup_bdist_wheel [...]``: Runs ``setup.py bdist_wheel`` with
+   the given arguments, as well as additional default arguments used for
+   installing packages into Sage.
+
 - ``sdh_pip_install [...]``: The equivalent of running ``pip install``
    with the given arguments, as well as additional default arguments used for
    installing packages into Sage with pip. The last argument must be