From 3c1ba3adc5289fdbb85a144e89ae366c9ac9454f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sun, 12 Feb 2017 16:50:49 +0100 Subject: [PATCH] qt5: fix armv6* build Remove dependency on libvpx-devel for armv6* as it can't be cross compiled. --- srcpkgs/qt5/template | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index ea6a8bddf6a..a986b74e3ba 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -19,7 +19,7 @@ makedepends=" fontconfig-devel libXi-devel libXv-devel libXinerama-devel libXrandr-devel libXcursor-devel libXScrnSaver-devel dbus-devel glib-devel icu-devel cups-devel libjpeg-turbo-devel sqlite-devel alsa-lib-devel tiff-devel - libmng-devel libsrtp-devel libvpx-devel snappy-devel minizip-devel + libmng-devel libsrtp-devel snappy-devel minizip-devel libxshmfence-devel libSM-devel xcb-util-keysyms-devel xcb-util-image-devel xcb-util-renderutil-devel xcb-util-wm-devel libXcomposite-devel libwebp-devel libxkbcommon-devel harfbuzz-devel gtk+-devel @@ -37,6 +37,11 @@ CXXFLAGS="-DOPENSSL_NO_SSL3_METHOD" # Required for musl libc LDFLAGS="-pthread" +case "$XBPS_TARGET_MACHINE" in + armv[5-6]*) ;; # Can't cross compile libvpx + *) makedepends+=" libvpx-devel" +esac + if [ -n "$CROSS_BUILD" ]; then # Need some devel packages in the host to build qmake, moc, uic, rcc # wayland-devel contains /usr/bin/wayland-scanner