From f68162d5827fce41e7c2d4eb65cab6fcd8b9dd60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Fri, 22 Dec 2023 08:21:36 +0100 Subject: [PATCH] disable 32-bit environments on uriparser dependent packages --- mingw-w64-arrow/PKGBUILD | 9 +++++---- mingw-w64-collada-dom/PKGBUILD | 2 +- mingw-w64-groonga/PKGBUILD | 27 ++++++++++++++++----------- mingw-w64-libkml/PKGBUILD | 7 +++---- 4 files changed, 25 insertions(+), 20 deletions(-) diff --git a/mingw-w64-arrow/PKGBUILD b/mingw-w64-arrow/PKGBUILD index f3c621af74..23afd42b04 100644 --- a/mingw-w64-arrow/PKGBUILD +++ b/mingw-w64-arrow/PKGBUILD @@ -7,7 +7,7 @@ pkgver=14.0.2 pkgrel=1 pkgdesc="Apache Arrow is a cross-language development platform for in-memory data (mingw-w64)" arch=(any) -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://arrow.apache.org/" license=('spdx:Apache-2.0') depends=("${MINGW_PACKAGE_PREFIX}-abseil-cpp" @@ -65,17 +65,18 @@ validpgpkeys=('35CF82A165DDBBA29B307B7497D7E8647AE7E47B' build() { mkdir -p "${srcdir}"/build-${MSYSTEM}-cpp && cd "${srcdir}"/build-${MSYSTEM}-cpp + declare -a _extra_config if check_option "debug" "n"; then - export _cmake_build_type="Release" + _extra_config+=("-DCMAKE_BUILD_TYPE=Release") else - export _cmake_build_type="Debug" + _extra_config+=("-DCMAKE_BUILD_TYPE=Debug") fi MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake.exe -Wno-dev \ -G Ninja \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ - -DCMAKE_BUILD_TYPE=${_cmake_build_type} \ + "${_extra_config[@]}" \ -DARROW_ACERO=ON \ -DARROW_BUILD_UTILITIES=ON \ -DARROW_COMPUTE=ON \ diff --git a/mingw-w64-collada-dom/PKGBUILD b/mingw-w64-collada-dom/PKGBUILD index f12d7143e2..fd9a09f336 100644 --- a/mingw-w64-collada-dom/PKGBUILD +++ b/mingw-w64-collada-dom/PKGBUILD @@ -7,7 +7,7 @@ pkgver=2.5.0 pkgrel=3 pkgdesc="API that provides a C++ object representation of a COLLADA XML instance document (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://github.com/rdiankov/collada-dom/" license=("spdx:MIT") makedepends=("${MINGW_PACKAGE_PREFIX}-cc" diff --git a/mingw-w64-groonga/PKGBUILD b/mingw-w64-groonga/PKGBUILD index 527645e4ff..dfca7b339c 100644 --- a/mingw-w64-groonga/PKGBUILD +++ b/mingw-w64-groonga/PKGBUILD @@ -7,10 +7,9 @@ pkgver=13.0.9 pkgrel=2 pkgdesc="An opensource fulltext search engine (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') +mingw_arch=('mingw64' 'ucrt64' 'clang64') url="https://groonga.org/" -license=('LGPL2') -options=('strip' 'staticlibs') +license=('spdx:LGPL-2.1-or-later') source=(https://packages.groonga.org/source/${_realname}/${_realname}-${pkgver}.tar.gz{,.asc}) depends=("${MINGW_PACKAGE_PREFIX}-arrow" "${MINGW_PACKAGE_PREFIX}-blosc2" @@ -34,25 +33,31 @@ sha256sums=('66678e630addd57bf0aaae7ae733ad703bfa85e38b555685d383358c4b630cef' validpgpkeys=('2701F317CFCCCB975CADE9C2624CF77434839225') # Groonga Key build() { - [[ -d ${srcdir}/build-${CARCH} ]] && rm -rf ${srcdir}/build-${CARCH} - mkdir -p ${srcdir}/build-${CARCH} && cd ${srcdir}/build-${CARCH} + mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM} + + declare -a _extra_config + if check_option "debug" "n"; then + _extra_config+=("-DCMAKE_BUILD_TYPE=Release") + else + _extra_config+=("-DCMAKE_BUILD_TYPE=Debug") + fi MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake.exe \ - ../${_realname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ + -G Ninja \ + "${_extra_config[@]}" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DGRN_WITH_APACHE_ARROW=ON \ -DGRN_WITH_BLOSC=auto \ -DGRN_WITH_MRUBY=ON \ - -G Ninja + ../${_realname}-${pkgver} - ninja + ${MINGW_PREFIX}/bin/cmake --build . } package() { - cd ${srcdir}/build-${CARCH} - DESTDIR="${pkgdir}" ninja install + cd ${srcdir}/build-${MSYSTEM} + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install . local PREFIX_DEPS=$(cygpath -am ${MINGW_PREFIX}) pushd "${pkgdir}${MINGW_PREFIX}/lib/pkgconfig" diff --git a/mingw-w64-libkml/PKGBUILD b/mingw-w64-libkml/PKGBUILD index 8d9050a07e..91a12fa27a 100644 --- a/mingw-w64-libkml/PKGBUILD +++ b/mingw-w64-libkml/PKGBUILD @@ -7,12 +7,12 @@ pkgver=1.3.0 pkgrel=10 pkgdesc="Reference implementation of OGC KML 2.2 (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://github.com/libkml/libkml/" license=('BSD') -makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" +makedepends=("${MINGW_PACKAGE_PREFIX}-cc" + "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" - "${MINGW_PACKAGE_PREFIX}-cc" #"${MINGW_PACKAGE_PREFIX}-python" #"${MINGW_PACKAGE_PREFIX}-swig" ) @@ -39,7 +39,6 @@ prepare() { } build() { - [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM} mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM} MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \