Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorTasos Sahanidis <tasos@tasossah.com>2024-05-08 06:48:52 +0300
committerTasos Sahanidis <tasos@tasossah.com>2024-05-08 06:48:52 +0300
commitb89f55702d80b2ece1ba29664d2448e5b9735ce9 (patch)
tree719456df9558fa371dcd63bd72151cf95e5368ad /extra
parentb5944b86f6eda1b4910307e3bf3fef9617daae6b (diff)
extra/cmake: Undo hacks for i686/p4 and fix expat
Diffstat (limited to 'extra')
-rw-r--r--extra/cmake/PKGBUILD77
1 files changed, 41 insertions, 36 deletions
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