diff --git a/p11-kit/mingw-w64/PKGBUILD b/p11-kit/mingw-w64/PKGBUILD index 15d58c2a..ac6662db 100644 --- a/p11-kit/mingw-w64/PKGBUILD +++ b/p11-kit/mingw-w64/PKGBUILD @@ -1,5 +1,6 @@ -# Maintainer: pingplug < aur at pingplug dot me > +# Maintainer of AUR version: pingplug < aur at pingplug dot me > # Contributor: xantares < xantares09 at hotmail dot com > +# Contributor: Martchus _commit=b0ebe7555c291808db29377ba79cb8326301f0a6 # 0.23.18.1 _architectures="i686-w64-mingw32 x86_64-w64-mingw32" @@ -13,8 +14,9 @@ url="https://p11-glue.freedesktop.org" license=('BSD') depends=('mingw-w64-crt' 'mingw-w64-libtasn1' - 'mingw-w64-libffi') -makedepends=('mingw-w64-configure' + 'mingw-w64-libffi' + 'mingw-w64-libiconv') +makedepends=('mingw-w64-meson' 'git') options=('!strip' 'staticlibs' '!buildflags') source=("git+https://github.com/p11-glue/p11-kit?#commit=${_commit}" @@ -34,28 +36,30 @@ prepare() { # libnssckbi.so ("Builtin Object Token" instead of "Default Trust") # https://bugs.freedesktop.org/show_bug.cgi?id=66161 patch -Np1 -i ../0001-Build-and-install-libnssckbi-p11-kit.so.patch - NOCONFIGURE=1 ./autogen.sh } build() { + export PYTHONPATH=/usr/lib/python3.7/site-packages cd "${srcdir}"/p11-kit for _arch in ${_architectures}; do mkdir -p build-${_arch} && pushd build-${_arch} - ${_arch}-configure --disable-static --disable-silent-rules --disable-trust-module - make + ${_arch}-meson -D gtk_doc=false -D man=false --default-library both + ninja popd done } package() { + export PYTHONPATH=/usr/lib/python3.7/site-packages for _arch in ${_architectures}; do cd "${srcdir}"/p11-kit/build-${_arch} - make install DESTDIR="${pkgdir}" - rm "${pkgdir}"/usr/${_arch}/bin/*.exe - rm -r "${pkgdir}"/usr/${_arch}/libexec + DESTDIR="${pkgdir}" ninja install rm -r "${pkgdir}"/usr/${_arch}/etc ${_arch}-strip --strip-unneeded "${pkgdir}"/usr/${_arch}/bin/*.dll ${_arch}-strip -g "${pkgdir}"/usr/${_arch}/lib/*.a + + # see https://github.com/mesonbuild/meson/issues/4138 + ${_arch}-gcc-ranlib ${pkgdir}/usr/${_arch}/lib/*.a done }