diff options
| author |   Michael Weber <xmw@gentoo.org> | 2013-06-26 10:28:13 +0000 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2013-06-26 10:28:13 +0000 |
| commit | 77760dd9ae0124ed0b696d99c8cef174fd8ef1ac (patch) | |
| tree | 9632edb73b888a56db6d0a9bf79d8bb9a39b71f9 /dev-libs/yajl/yajl-2.0.4-r2.ebuild | |
| parent | old (diff) | |
| download | historical-77760dd9ae0124ed0b696d99c8cef174fd8ef1ac.tar.gz historical-77760dd9ae0124ed0b696d99c8cef174fd8ef1ac.tar.bz2 historical-77760dd9ae0124ed0b696d99c8cef174fd8ef1ac.zip | |
fix USE=-static-libs (patch did not work, just remove .a after build/install, bug 474814 by patrick), fix src_test.
Package-Manager: portage-2.2.0_alpha185/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090
Diffstat (limited to 'dev-libs/yajl/yajl-2.0.4-r2.ebuild')
| -rw-r--r-- | dev-libs/yajl/yajl-2.0.4-r2.ebuild | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/dev-libs/yajl/yajl-2.0.4-r2.ebuild b/dev-libs/yajl/yajl-2.0.4-r2.ebuild index 8e8db9a3bf4c..52d163f0f3af 100644 --- a/dev-libs/yajl/yajl-2.0.4-r2.ebuild +++ b/dev-libs/yajl/yajl-2.0.4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/yajl/yajl-2.0.4-r2.ebuild,v 1.1 2013/06/23 22:19:25 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/yajl/yajl-2.0.4-r2.ebuild,v 1.2 2013/06/26 10:28:11 xmw Exp $ EAPI=5 @@ -17,11 +17,21 @@ IUSE="static-libs" src_prepare() { epatch "${FILESDIR}"/${PN}-fix_static_linking.patch - if ! use static-libs ; then - epatch "${FILESDIR}"/${P}-remove_static_lib.patch - fi + + multilib_copy_sources } src_test() { - multilib_foreach_abi run_in_build_dir emake test + run_test() { + cd "${BUILD_DIR}"/test + ./run_tests.sh ./yajl_test || die + } + multilib_parallel_foreach_abi run_test +} + +src_install() { + cmake-multilib_src_install + + use static-libs || \ + find "${D}" -name libyajl_s.a -delete } |