diff --git a/mingw-w64-libpsl/PKGBUILD b/mingw-w64-libpsl/PKGBUILD index 64c4c25ee6..64e1f5d646 100644 --- a/mingw-w64-libpsl/PKGBUILD +++ b/mingw-w64-libpsl/PKGBUILD @@ -4,7 +4,7 @@ _realname=libpsl pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=0.21.2 -pkgrel=1 +pkgrel=2 pkgdesc="Public Suffix List library (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -14,14 +14,13 @@ depends=("${MINGW_PACKAGE_PREFIX}-libiconv" "${MINGW_PACKAGE_PREFIX}-libidn2" "${MINGW_PACKAGE_PREFIX}-libunistring" "${MINGW_PACKAGE_PREFIX}-gettext") -makedepends=("${MINGW_PACKAGE_PREFIX}-libxslt" - "${MINGW_PACKAGE_PREFIX}-python" - "${MINGW_PACKAGE_PREFIX}-gettext" - "${MINGW_PACKAGE_PREFIX}-gtk-doc" +makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-meson" - "${MINGW_PACKAGE_PREFIX}-pkg-config" "${MINGW_PACKAGE_PREFIX}-ninja" - "${MINGW_PACKAGE_PREFIX}-cc") + "${MINGW_PACKAGE_PREFIX}-pkg-config" + "${MINGW_PACKAGE_PREFIX}-python" + "${MINGW_PACKAGE_PREFIX}-gtk-doc" + "${MINGW_PACKAGE_PREFIX}-libxslt") source=("https://github.com/rockdaboot/libpsl/releases/download/${pkgver}/${_realname}-${pkgver}.tar.gz" 001-Fix-build-on-Windows.patch::https://github.com/rockdaboot/libpsl/commit/c47cf796.patch) sha256sums=('e35991b6e17001afa2c0ca3b10c357650602b92596209b7492802f3768a6285f' @@ -33,6 +32,21 @@ prepare() { } build() { + # static + [[ -d "${srcdir}/build-static-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-static-${MSYSTEM}" + mkdir -p "${srcdir}/build-static-${MSYSTEM}" && cd "${srcdir}/build-static-${MSYSTEM}" + + MSYS2_ARG_CONV_EXCL="--prefix=" \ + ${MINGW_PREFIX}/bin/meson setup \ + --prefix="${MINGW_PREFIX}" \ + --buildtype plain \ + --default-library=static \ + -Druntime=libidn2 \ + ../${_realname}-${pkgver} + + ${MINGW_PREFIX}/bin/meson compile + + # shared [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}" mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" @@ -40,7 +54,7 @@ build() { ${MINGW_PREFIX}/bin/meson setup \ --prefix="${MINGW_PREFIX}" \ --buildtype plain \ - --default-library=both \ + --default-library=shared \ -Druntime=libidn2 \ ../${_realname}-${pkgver} @@ -48,6 +62,8 @@ build() { } package() { + cd "${srcdir}/build-static-${MSYSTEM}" + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/meson install cd "${srcdir}/build-${MSYSTEM}" DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/meson install