diff options
author | Karl Trygve Kalleberg <karltk@gentoo.org> | 2004-03-31 00:20:49 +0000 |
---|---|---|
committer | Karl Trygve Kalleberg <karltk@gentoo.org> | 2004-03-31 00:20:49 +0000 |
commit | 91a300af1e3800ee0f4e948022256f870ee82ba9 (patch) | |
tree | 57c7e1496fb088a1eb91c6c33bda5cff91eacd48 /dev-java | |
parent | Adds more intelligence to java-pkg_jar-from. (diff) | |
download | gentoo-2-91a300af1e3800ee0f4e948022256f870ee82ba9.tar.gz gentoo-2-91a300af1e3800ee0f4e948022256f870ee82ba9.tar.bz2 gentoo-2-91a300af1e3800ee0f4e948022256f870ee82ba9.zip |
Updated how we link in external libs.
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/axion/axion-1.0_rc2.ebuild | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/dev-java/axion/axion-1.0_rc2.ebuild b/dev-java/axion/axion-1.0_rc2.ebuild index 47dc8036854a..436da1deaa1f 100644 --- a/dev-java/axion/axion-1.0_rc2.ebuild +++ b/dev-java/axion/axion-1.0_rc2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/axion/axion-1.0_rc2.ebuild,v 1.1 2004/03/30 23:59:47 karltk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/axion/axion-1.0_rc2.ebuild,v 1.2 2004/03/31 00:20:49 karltk Exp $ inherit java-pkg @@ -27,28 +27,21 @@ S=${WORKDIR}/${PN}-1.0-M2 src_unpack() { unpack ${A} cd ${S} - # It's pure luck that this works. Only the first element of - # each classpath will be picked. We need to symlink all - # jarfiles into lib/ at some point. - ( echo junit.jar=$(java-config -p junit) - echo collections.jar=$(java-config -p commons-collections) - echo primitives.jar=$(java-config -p commons-primitives) - echo logging.jar=$(java-config -p commons-logging) - echo codec.jar=$(java-config -p commons-codec) - echo logging-impl.jar=$(java-config -p log4j) - echo regexp.jar=$(java-config -p regexp) - echo javacc.home=/usr/share/javacc/lib - ) > build.properties - mkdir lib test - # Given the state of brokenness in this build system, we will - # need to do this for all the jars it depends on. + mkdir lib test ( cd lib - for x in $(java-config -p commons-primitives | tr -d :) ; do - ln -s ${x} . - done + java-pkg_jar-from junit || die junit + java-pkg_jar-from commons-collections || die commons-collections + java-pkg_jar-from commons-primitives || die commons-primitives + java-pkg_jar-from commons-logging || die commons-logging + java-pkg_jar-from commons-codec || die commons-codec + java-pkg_jar-from log4j || die log4j + java-pkg_jar-from regexp || die regexp ) + + echo javacc.home=/usr/share/javacc/lib \ + > build.properties } src_compile() { |