diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2015-04-07 15:08:37 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-04-07 15:08:37 +0000 |
| commit | 061485541f30fcfca1bb57099bf981e2822f778d (patch) | |
| tree | 4ee0a1d55714c732df06b2bbabd730f566fa1137 /dev-qt | |
| parent | Fix Typo (diff) | |
| download | gentoo-2-061485541f30fcfca1bb57099bf981e2822f778d.tar.gz gentoo-2-061485541f30fcfca1bb57099bf981e2822f778d.tar.bz2 gentoo-2-061485541f30fcfca1bb57099bf981e2822f778d.zip | |
Only build for native ABI to avoid build failure since only ABI-neutral data is installed wrt bug #545142.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qttranslations/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild | 24 |
2 files changed, 25 insertions, 6 deletions
diff --git a/dev-qt/qttranslations/ChangeLog b/dev-qt/qttranslations/ChangeLog index 589f9568418e..f9bf9bf484d5 100644 --- a/dev-qt/qttranslations/ChangeLog +++ b/dev-qt/qttranslations/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-qt/qttranslations # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttranslations/ChangeLog,v 1.14 2015/03/29 14:31:05 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttranslations/ChangeLog,v 1.15 2015/04/07 15:08:37 kensington Exp $ + + 07 Apr 2015; Michael Palimaka <kensington@gentoo.org> + qttranslations-4.8.6-r1.ebuild: + Only build for native ABI to avoid build failure since only ABI-neutral data + is installed wrt bug #545142. 29 Mar 2015; Davide Pesavento <pesa@gentoo.org> qttranslations-5.4.1.ebuild: This package has no RDEPENDs (bug 544938). diff --git a/dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild b/dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild index a24ecdc4d0d8..e7d4d4851713 100644 --- a/dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild +++ b/dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild,v 1.1 2014/11/15 02:38:42 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild,v 1.2 2015/04/07 15:08:37 kensington Exp $ EAPI=5 @@ -24,7 +24,21 @@ RDEPEND="${DEPEND}" QT4_TARGET_DIRECTORIES="translations" multilib_src_configure() { - qt4_prepare_env - qt4_symlink_tools_to_build_dir - qt4_foreach_target_subdir qt4_qmake + if multilib_is_native_abi; then + qt4_prepare_env + qt4_symlink_tools_to_build_dir + qt4_foreach_target_subdir qt4_qmake + fi +} + +multilib_src_compile() { + multilib_is_native_abi && qt4_multilib_src_compile +} + +multilib_src_test() { + : +} + +multilib_src_install() { + multilib_is_native_abi && qt4_multilib_src_install } |