build/pkgs/*/spkg-install.in: Use new function sdh_setup_bdist_wheel

sagemath · Dec 7, 2020 · fb10429 · fb10429
1 parent c5a14a3
commit fb10429
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 14 deletions.
diff --git a/build/pkgs/gambit/spkg-install.in b/build/pkgs/gambit/spkg-install.in
@@ -11,9 +11,5 @@ cd src/python
 rm gambit/lib/libgambit.cpp
 
 # pip doesn't work (https://github.com/gambitproject/gambit/issues/207)
-sage-python23 setup.py --no-user-cfg bdist_wheel --bdist-dir "$(mktemp -d)"
-if [ $? -ne 0 ]; then
-    echo "Error installing Python API"
-    exit 1
-fi
+sdh_setup_bdist_wheel
 sdh_store_and_pip_install_wheel .
diff --git a/build/pkgs/numpy/spkg-install.in b/build/pkgs/numpy/spkg-install.in
@@ -26,10 +26,6 @@ export NUMPY_FCONFIG="config_fc --noopt --noarch"
 
 ################################################
 
-sage-python23 setup.py \
-        --no-user-cfg \
-       bdist_wheel \
-       --bdist-dir "$(mktemp -d)" \
-       ${NUMPY_FCONFIG} || sdh_die "Error building wheel for numpy"
+sdh_setup_bdist_wheel ${NUMPY_FCONFIG}
 
 sdh_store_and_pip_install_wheel .
diff --git a/build/pkgs/pillow/spkg-install.in b/build/pkgs/pillow/spkg-install.in
@@ -22,6 +22,6 @@ sdh_setup_bdist_wheel \
        build_ext \
        --debug \
        --disable-jpeg \
-       $extra_build_ext || sdh_die "Error building/installing Pillow"
+       $extra_build_ext
 
 sdh_store_and_pip_install_wheel .
diff --git a/build/pkgs/python_igraph/spkg-install.in b/build/pkgs/python_igraph/spkg-install.in
@@ -1,7 +1,5 @@
 cd src
 
-sage-python23 setup.py bdist_wheel \
-       --bdist-dir "$(mktemp -d)" \
-       --use-pkg-config || sdh_die "Error building wheel for python_igraph"
+sdh_setup_bdist_wheel --use-pkg-config
 
 sdh_store_and_pip_install_wheel .