commit ced927c5d65a3b6d56ce4bbbdcc2eed5f11f718a Author: Danny Rawlins <monster.romster@gmail.com> Date: Sun Nov 5 20:23:48 2017 +1100 meson: fix removing sdist file only, but don't try to delete wheel directory of same name when python3-setuptools is installed FS#1527 diff --git a/meson/.signature b/meson/.signature index 5d74f39e2..8602e0810 100644 --- a/meson/.signature +++ b/meson/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/ZCEQd0VYxmgmy5gyAFt0Dci2GBB30U0d8pNMjLJN4E+Om817tBS4eZPi/Zs18I0mRw09JzUzc/8t6LPmBv5BQw= -SHA256 (Pkgfile) = 3b20b63cd24369fcbee0accae703cba283356cb005a1ab4465eb9043db7552b0 +RWSE3ohX2g5d/fZtxN/lMUwy1zIIWuOm1WsvRwbgX+xSloIOQZ03W7QjgpZJ+uSTdmwIjaLcWvf7oDWCzXpxWasAQOokJdKE1wg= +SHA256 (Pkgfile) = 2ce64880e2a7d04bb87ffbfd4e131f40f23cf41165ad27f3f1be6ccf248723d0 SHA256 (.footprint) = 6e1c245071478a93786ed1e6ecdd758985cf36642be63e365b4ec7b382912e53 SHA256 (meson-0.43.0.tar.gz) = c513eca90e0d70bf14cd1eaafea2fa91cf40a73326a7ff61f08a005048057340 diff --git a/meson/Pkgfile b/meson/Pkgfile index 37a6f690c..b922886cb 100644 --- a/meson/Pkgfile +++ b/meson/Pkgfile @@ -17,7 +17,8 @@ build() { /usr/bin/python3 setup.py install \ --prefix=/usr --root=$PKG --optimize=1 - # remove sdist metadata, as wheel metadata will be used with python3-setuptools - # force remove as this file will not exist with pyhton3-setuptools installed - rm -f $PKG/usr/lib/python*/site-packages/meson-$version-py*.egg-info + # remove sdist metadata, as wheel metadata will be used + # with python3-setuptools + find $PKG/usr/lib/python*/site-packages/ -maxdepth 1 -type f \ + -name "meson-$version-py*.egg-info" -delete }