diff options
| author |   Michael Weber <xmw@gentoo.org> | 2012-07-18 07:16:31 +0000 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2012-07-18 07:16:31 +0000 |
| commit | a51d383f85abddba2a18d7711d848a91656bf728 (patch) | |
| tree | 38a74b4c8d0ab9a8ff50aeabd36f2d7763b9287f /dev-libs/libparserutils | |
| parent | Drop eautoreconf for Prefix, it actually breaks the build, thanks Steven Trog... (diff) | |
| download | gentoo-2-a51d383f85abddba2a18d7711d848a91656bf728.tar.gz gentoo-2-a51d383f85abddba2a18d7711d848a91656bf728.tar.bz2 gentoo-2-a51d383f85abddba2a18d7711d848a91656bf728.zip | |
fix shared/static targets for test
(Portage version: 2.1.11.8/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/libparserutils')
| -rw-r--r-- | dev-libs/libparserutils/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/libparserutils/libparserutils-0.1.1.ebuild | 27 |
2 files changed, 17 insertions, 15 deletions
diff --git a/dev-libs/libparserutils/ChangeLog b/dev-libs/libparserutils/ChangeLog index 6999f0535c6c..e6b40363382c 100644 --- a/dev-libs/libparserutils/ChangeLog +++ b/dev-libs/libparserutils/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/libparserutils # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libparserutils/ChangeLog,v 1.3 2012/07/18 03:05:41 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libparserutils/ChangeLog,v 1.4 2012/07/18 07:16:31 xmw Exp $ + + 18 Jul 2012; Michael Weber <xmw@gentoo.org> libparserutils-0.1.1.ebuild: + fix shared/static targets for test 18 Jul 2012; Michael Sterrett <mr_bones_@gentoo.org> libparserutils-0.1.1.ebuild: diff --git a/dev-libs/libparserutils/libparserutils-0.1.1.ebuild b/dev-libs/libparserutils/libparserutils-0.1.1.ebuild index 56b1ca9dc706..4698c67f79a3 100644 --- a/dev-libs/libparserutils/libparserutils-0.1.1.ebuild +++ b/dev-libs/libparserutils/libparserutils-0.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libparserutils/libparserutils-0.1.1.ebuild,v 1.3 2012/07/18 03:05:41 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libparserutils/libparserutils-0.1.1.ebuild,v 1.4 2012/07/18 07:16:31 xmw Exp $ EAPI=4 @@ -24,9 +24,9 @@ src_prepare() { -i Makefile || die sed -e "/^libdir/s:/lib:/$(get_libdir):g" \ -i ${PN}.pc.in || die - echo "Q := " >> Makefile.config.override || die - echo "CC := $(tc-getCC)" >> Makefile.config.override || die - echo "AR := $(tc-getAR)" >> Makefile.config.override || die + echo "Q := " >> Makefile.config.override + echo "CC := $(tc-getCC)" >> Makefile.config.override + echo "AR := $(tc-getAR)" >> Makefile.config.override } src_configure() { @@ -39,18 +39,17 @@ src_configure() { src_compile() { emake COMPONENT_TYPE=lib-shared - if use static-libs ; then - emake COMPONENT_TYPE=lib-static - fi - if use doc ; then - emake doc - fi + use static-libs && emake COMPONENT_TYPE=lib-static +} + +src_test() { + emake COMPONENT_TYPE=lib-shared test + use static-libs && emake COMPONENT_TYPE=lib-static test } src_install() { - emake DESTDIR="${D}" PREFIX=/usr install - if use static-libs ; then - emake COMPONENT_TYPE=lib-static DESTDIR="${D}" PREFIX=/usr install || die - fi + emake DESTDIR="${D}" PREFIX=/usr COMPONENT_TYPE=lib-shared install + use static-libs && \ + emake DESTDIR="${D}" PREFIX=/usr COMPONENT_TYPE=lib-static install dodoc README docs/Todo } |