Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/extra/libjpeg-turbo/PKGBUILD
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/libjpeg-turbo/PKGBUILD
parent149f379709d64b238fa46b48a3ef88816f1bc8a1 (diff)
parentd2b638674f3c14e77568c33672da0e13cf0d7cf9 (diff)
Merge branch 'master' into i486
Diffstat (limited to 'extra/libjpeg-turbo/PKGBUILD')
-rw-r--r--extra/libjpeg-turbo/PKGBUILD5
1 files changed, 4 insertions, 1 deletions
diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD
index e33bc686..15f620d3 100644
--- a/extra/libjpeg-turbo/PKGBUILD
+++ b/extra/libjpeg-turbo/PKGBUILD
@@ -1,6 +1,9 @@
+# no Java on i486
+makedepends=(${makedepends[@]//jdk8-openjdk/})
+makedepends_i686+=(jdk8-openjdk)
+
if [ "${CARCH}" = "i486" ]; then
# no Java
- makedepends=(${makedepends[@]//jdk8-openjdk/})
eval "$(
declare -f build | \
sed '