diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2019-09-27 11:41:30 +0200 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2019-09-27 11:47:09 +0200 |
| commit | 9b4dab751e60b6d9e85d683f4f344194e0cd70b7 (patch) | |
| tree | 7b5f0059de059119c5f03c476bb556ae4ef10a5c | |
| parent | dev-db/postgresql: Bump to 12_rc1 (diff) | |
| download | gentoo-9b4dab751e60b6d9e85d683f4f344194e0cd70b7.tar.gz gentoo-9b4dab751e60b6d9e85d683f4f344194e0cd70b7.tar.bz2 gentoo-9b4dab751e60b6d9e85d683f4f344194e0cd70b7.zip | |
eclass/ant-tasks.eclass: added support for multiple deps
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
| -rw-r--r-- | eclass/ant-tasks.eclass | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass index 309df084d156..04c6fb5b7d67 100644 --- a/eclass/ant-tasks.eclass +++ b/eclass/ant-tasks.eclass @@ -54,7 +54,9 @@ ANT_TASK_NAME="${PN#ant-}" # @DESCRIPTION: # Specifies JAVA_PKG_NAME (PN{-SLOT} used with java-pkg_jar-from) of the package # that this one depends on. Defaults to the name of ant task, ebuild can -# override it before inheriting this eclass. +# override it before inheriting this eclass. In case there is more than one +# dependency, the variable can be specified as bash array with multiple strings, +# one for each dependency. ANT_TASK_DEPNAME=${ANT_TASK_DEPNAME-${ANT_TASK_NAME}} # @ECLASS-VARIABLE: ANT_TASK_DISABLE_VM_DEPS @@ -105,7 +107,7 @@ S="${WORKDIR}/${MY_P}" # base: performs the unpack, build.xml replacement and symlinks ant.jar from # ant-core # -# jar-dep: symlinks the jar file(s) from dependency package +# jar-dep: symlinks the jar file(s) from dependency package(s) ant-tasks_src_unpack() { [[ -z "${1}" ]] && ant-tasks_src_unpack all @@ -129,9 +131,11 @@ ant-tasks_src_unpack() { # ant.jar to build against java-pkg_jar-from --build-only ant-core ant.jar;; jar-dep) - # get jar from the dependency package + # get jar from the dependency package(s) if [[ -n "${ANT_TASK_DEPNAME}" ]]; then - java-pkg_jar-from ${ANT_TASK_DEPNAME} + for depname in "${ANT_TASK_DEPNAME[@]}"; do + java-pkg_jar-from ${depname} + done fi;; all) ant-tasks_src_unpack base jar-dep;; |