From 18a3e92ba6dd457cbea764efa298ecc8e20a20a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 2 Sep 2020 16:49:04 -0300 Subject: [PATCH 1/2] apache-maven: add which to depends. --- srcpkgs/apache-maven/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/apache-maven/template b/srcpkgs/apache-maven/template index a6c9fd3e5a2..f7cc818b5f4 100644 --- a/srcpkgs/apache-maven/template +++ b/srcpkgs/apache-maven/template @@ -1,10 +1,10 @@ # Template file for 'apache-maven' pkgname=apache-maven version=3.6.3 -revision=1 +revision=2 archs=noarch hostmakedepends="openjdk8" -depends="virtual?java-environment" +depends="virtual?java-environment which" short_desc="Software project management and comprehension tool" maintainer="Michael Aldridge " license="Apache-2.0" From 2d67267254b443154d164d032a40c1a4a3985c1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 2 Sep 2020 16:49:31 -0300 Subject: [PATCH 2/2] dbeaver: use apache-maven in hostmakedeps. Add comment about archs as well. --- srcpkgs/dbeaver/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template index cc14998e493..6ca79a1051a 100644 --- a/srcpkgs/dbeaver/template +++ b/srcpkgs/dbeaver/template @@ -2,8 +2,9 @@ pkgname=dbeaver version=7.1.5 revision=1 +# the build downloads binaries linked to glibc archs="x86_64" -hostmakedepends="apache-maven-bin" +hostmakedepends="apache-maven" short_desc="Free Universal Database Tool" maintainer="Kyle Nusbaum " license="Apache-2.0" @@ -13,6 +14,7 @@ checksum=b7fbd60e8ac38f8c68ff48dd61455ddf4d0666390d21aa6980cd5b91872e7651 nopie=true do_build() { + . /etc/profile.d/apache-maven.sh mvn package }