summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLouis Sautier <sbraz@gentoo.org>2018-12-05 10:49:01 +0100
committerLouis Sautier <sbraz@gentoo.org>2018-12-05 10:52:47 +0100
commit91433e5fca89bb5281548d29e3c13278ad295425 (patch)
tree92d405359fa6ba3939584f71526fe6d6805ee4ee
parentapp-misc/mosquitto: amd64 stable wrt bug #668436 (diff)
downloadgentoo-91433e5fca89bb5281548d29e3c13278ad295425.tar.gz
gentoo-91433e5fca89bb5281548d29e3c13278ad295425.tar.bz2
gentoo-91433e5fca89bb5281548d29e3c13278ad295425.zip
media-gfx/zbar: fix build failures on multilib systems
* Explicitly disable QT on non-native ABIs, otherwise it is implicitly enabled by upstream's build system. * Wrap QT-related headers that are only included for native ABI builds. Closes: https://bugs.gentoo.org/672500 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Louis Sautier <sbraz@gentoo.org>
-rw-r--r--media-gfx/zbar/zbar-0.20.1.ebuild12
1 files changed, 12 insertions, 0 deletions
diff --git a/media-gfx/zbar/zbar-0.20.1.ebuild b/media-gfx/zbar/zbar-0.20.1.ebuild
index 8d21ca2a30a..643a3a60ea9 100644
--- a/media-gfx/zbar/zbar-0.20.1.ebuild
+++ b/media-gfx/zbar/zbar-0.20.1.ebuild
@@ -125,6 +125,8 @@ multilib_src_configure() {
else
myeconfargs+=( --without-qt )
fi
+ else
+ myeconfargs+=( --without-qt )
fi
ECONF_SOURCE=${S} \
@@ -138,6 +140,16 @@ src_test() {
virtx multilib-minimal_src_test
}
+src_install() {
+ if use qt5; then
+ local MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/zbar/QZBar.h
+ /usr/include/zbar/QZBarImage.h
+ )
+ fi
+ multilib-minimal_src_install
+}
+
multilib_src_install_all() {
einstalldocs
find "${D}" -name '*.la' -delete || die