Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-01-21 10:05:49 +0100
committerErich Eckner <git@eckner.net>2019-01-21 10:05:49 +0100
commiteb9e53e6fec356dba092d3163ede62c834f03fae (patch)
treed17ae163dd4262d6a6292cdd65dddc28d7ff7830
parent764007895bd490c1f0d031b9cccea5c2b30c9e1e (diff)
parent29a2ef18154808e622c0cd0b4e993e0e62b6b679 (diff)
Merge branch 'master' into i486
-rw-r--r--extra/python/PKGBUILD13
1 files changed, 4 insertions, 9 deletions
diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD
index 407d9333..5521b6d6 100644
--- a/extra/python/PKGBUILD
+++ b/extra/python/PKGBUILD
@@ -15,16 +15,11 @@ eval "$(
"
)"
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
- # remove dependency on most things, we want only a simple interpreter
- # a little bit smarter than a shell for building and code generation
- makedepends=(${makedepends[@]//tk/})
- makedepends=(${makedepends[@]//bluez-libs/})
- makedepends=(${makedepends[@]//llvm/})
+makedepends=(${makedepends[@]//xorg-server-xvfb/})
+makedepends_i686=(xorg-server-xvfb)
- # do not start X servers just for building software!
- makedepends=(${makedepends[@]//xorg-server-xvfb/})
+# skip xvfb stuff on i486
+if [ "$CARCH" = 'i486' ]; then
eval "$(
declare -f build | \
sed '