diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2010-04-16 13:24:59 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2010-04-16 13:24:59 +0000 |
| commit | 3c1f05b0013c1ac7ceb691544e268ec64f3561f2 (patch) | |
| tree | 17ad2839853317d203202d1afea4ed20f0ab091f /dev-java/jaxme | |
| parent | Stable for HPPA (bug #314035). (diff) | |
| download | gentoo-2-3c1f05b0013c1ac7ceb691544e268ec64f3561f2.tar.gz gentoo-2-3c1f05b0013c1ac7ceb691544e268ec64f3561f2.tar.bz2 gentoo-2-3c1f05b0013c1ac7ceb691544e268ec64f3561f2.zip | |
Fix building with USE=doc, bug #310311. Thanks to Cosmin Giradu for finding the reason.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/jaxme')
| -rw-r--r-- | dev-java/jaxme/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/jaxme/jaxme-0.5.2.ebuild | 17 |
2 files changed, 16 insertions, 7 deletions
diff --git a/dev-java/jaxme/ChangeLog b/dev-java/jaxme/ChangeLog index a1f0b19174e4..0d984b92d892 100644 --- a/dev-java/jaxme/ChangeLog +++ b/dev-java/jaxme/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/jaxme # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/ChangeLog,v 1.34 2010/01/20 02:59:59 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/ChangeLog,v 1.35 2010/04/16 13:24:59 caster Exp $ + + 16 Apr 2010; Vlastimil Babka <caster@gentoo.org> jaxme-0.5.2.ebuild: + Fix building with USE=doc, bug #310311. Thanks to Cosmin Giradu for + finding the reason. 20 Jan 2010; Brent Baude <ranger@gentoo.org> jaxme-0.5.2.ebuild: Marking jaxme-0.5.2 ppc64 for bug 292286 diff --git a/dev-java/jaxme/jaxme-0.5.2.ebuild b/dev-java/jaxme/jaxme-0.5.2.ebuild index ff14f16fadd3..542ffd64c35d 100644 --- a/dev-java/jaxme/jaxme-0.5.2.ebuild +++ b/dev-java/jaxme/jaxme-0.5.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/jaxme-0.5.2.ebuild,v 1.7 2010/01/20 02:59:59 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/jaxme-0.5.2.ebuild,v 1.8 2010/04/16 13:24:59 caster Exp $ EAPI="2" @@ -46,7 +46,7 @@ java_prepare() { java-pkg_jarfrom xmldb xmldb-api-sdk.jar xmldb-api-sdk-20021118.jar java-pkg_jarfrom --build-only ant-core ant.jar ant-1.5.4.jar java-pkg_jarfrom --build-only ant-core ant.jar ant.jar - # no linking to it, probably should be test only (FIXME) + # no linking to it, should be used for tests only but used to generate stuff during build anyway java-pkg_jarfrom --build-only hsqldb hsqldb.jar hsqldb-1.7.1.jar # Special case: jaxme uses ant/*.xml files, so rewriting them by hand @@ -60,14 +60,19 @@ java_prepare() { epatch "${FILESDIR}/${P}-fix_marshallers.patch" } -EANT_BUILD_TARGET="all" -EANT_EXTRA_ARGS="" EANT_TEST_ANT_TASKS="hsqldb" src_compile() { - use doc && EANT_EXTRA_ARGS+="-Dbuild.apidocs=dist/doc/api" + local ant_target="all" + local ant_args="" + if use doc; then + ant_args="-Dbuild.apidocs=dist/doc/api" + # The javadoc target depends on all so it is enough. Passing both results in two builds, + # where the second pass fails due to hsqldb lock - bug #310311. + ant_target="javadoc" + fi - java-pkg-2_src_compile + eant ${ant_args} ${ant_target} } src_install() { |