From 9b4dab751e60b6d9e85d683f4f344194e0cd70b7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Miroslav=20=C5=A0ulc?= Date: Fri, 27 Sep 2019 11:41:30 +0200 Subject: [PATCH] eclass/ant-tasks.eclass: added support for multiple deps MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Miroslav Å ulc --- eclass/ant-tasks.eclass | 12 ++++++++---- 1 file 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;; -- 2.26.2