diff --git a/srcpkgs/python3-scikit-image/template b/srcpkgs/python3-scikit-image/template index b19743e50f3..40a3413b5ff 100644 --- a/srcpkgs/python3-scikit-image/template +++ b/srcpkgs/python3-scikit-image/template @@ -3,7 +3,7 @@ pkgname=python3-scikit-image version=0.21.0 revision=1 build_style=python3-pep517 -build_helper="meson" +build_helper="meson numpy" hostmakedepends="python3-build python3-installer python3-meson-python python3-wheel python3-setuptools python3-packaging python3-Cython pythran python3-lazy_loader python3-numpy pkg-config" @@ -20,32 +20,6 @@ checksum=53a82a9dbd3ed608d2ad3876269a271a7e922b12e228388eac996b508aadd652 # Tests require data files and unpackaged dependencies make_check=no -if [ "${CROSS_BUILD}" ]; then - make_build_args+=" --no-isolation --wheel - -Csetup-args=--cross-file=${XBPS_WRAPPERDIR}/meson/xbps_meson.cross - -Csetup-args=--cross-file=${XBPS_WRAPPERDIR}/meson/python.cross" -fi - -post_patch() { - if [ "${CROSS_BUILD}" ]; then - local _xpy="${XBPS_CROSS_BASE}/${py3_sitelib}" - cat > "${XBPS_WRAPPERDIR}/meson/python.cross" <<-EOF - [properties] - numpy-include-dir = '${_xpy}/numpy/core/include' - pythran-include-dir = '${_xpy}/pythran' - EOF - fi -} - -pre_build() { - if [ "${CROSS_BUILD}" ]; then - # Meson can't tolerate $CC with arguments as set by build helper - CC="${XBPS_CROSS_TRIPLET}-gcc" - # CXX needs to know where to find Python headers - CXXFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc}" - fi -} - post_install() { vlicense LICENSE.txt }