summaryrefslogtreecommitdiff
path: root/extra/nasm
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-01-21 10:09:17 +0100
committerErich Eckner <git@eckner.net>2019-01-21 10:09:17 +0100
commit35350ce1f7aba9843ea7218dee89ae30a1fe3f5e (patch)
tree7e95d77e100fee2080f754ec7e0846a46af5eaf7 /extra/nasm
parent149f379709d64b238fa46b48a3ef88816f1bc8a1 (diff)
parentd2b638674f3c14e77568c33672da0e13cf0d7cf9 (diff)
downloadpackages-35350ce1f7aba9843ea7218dee89ae30a1fe3f5e.tar.xz
Merge branch 'master' into i486
Diffstat (limited to 'extra/nasm')
-rw-r--r--extra/nasm/PKGBUILD6
1 files changed, 4 insertions, 2 deletions
diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD
index 36e81008..6e1fab99 100644
--- a/extra/nasm/PKGBUILD
+++ b/extra/nasm/PKGBUILD
@@ -6,11 +6,13 @@ prepare() {
patch -Np1 -i "$srcdir/0001-Remove-invalid-pure_func-qualifiers.patch"
}
+# remove ttf-liberation on i486 (X packages missing for installing the font)
+makedepends=(${makedepends[@]//ttf-liberation/})
+makedepends_i686+=(ttf-liberation)
+
# i486-specific
if [ "${CARCH}" = "i486" ]; then
# remove ttf-liberation (X packages missing for installing the font)
- makedepends=(${makedepends[@]//ttf-liberation/})
-
eval "$(
declare -f build | \
sed "