From b89f55702d80b2ece1ba29664d2448e5b9735ce9 Mon Sep 17 00:00:00 2001 From: Tasos Sahanidis Date: Wed, 8 May 2024 06:48:52 +0300 Subject: extra/cmake: Undo hacks for i686/p4 and fix expat --- extra/cmake/PKGBUILD | 77 ++++++++++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 36 deletions(-) (limited to 'extra/cmake') diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index 18217d41..d394180e 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,39 +1,44 @@ -# do not build in parallel on build slaves -eval "$( - declare -f build | \ - sed ' - s/--parallel=.*/--parallel=1/ - ' -)" +# cmake requires expat but upstream don't seem to include it +depends+=('expat') -# ignore gui (for now, needs Qt6, which needs atomics) -makedepends=(${makedepends[@]//qt6-base/}) -eval "$( - declare -f build | \ - sed ' - s/--qt-gui// - ' -)" +if [[ $CARCH = 'i486' ]]; then + # do not build in parallel on build slaves + eval "$( + declare -f build | \ + sed ' + s/--parallel=.*/--parallel=1/ + ' + )" -# disable documentation (python is somewhat broken currently) -makedepends=(${makedepends[@]//python-sphinx/}) -eval "$( - declare -f build | \ - sed ' - s/--sphinx-man// - s/--sphinx-html// - ' - declare -f package | \ - sed ' - /html\/_sources/d - ' -)" + # ignore gui (for now, needs Qt6, which needs atomics) + makedepends=(${makedepends[@]//qt6-base/}) + eval "$( + declare -f build | \ + sed ' + s/--qt-gui// + ' + )" -# emacs is broken currently -makedepends=(${makedepends[@]//emacs/}) -eval "$( - declare -f package | \ - sed ' - /emacs/d - ' -)" + # disable documentation (python is somewhat broken currently) + makedepends=(${makedepends[@]//python-sphinx/}) + eval "$( + declare -f build | \ + sed ' + s/--sphinx-man// + s/--sphinx-html// + ' + declare -f package | \ + sed ' + /html\/_sources/d + ' + )" + + # emacs is broken currently + makedepends=(${makedepends[@]//emacs/}) + eval "$( + declare -f package | \ + sed ' + /emacs/d + ' + )" +fi -- cgit v1.2.3-70-g09d2