summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSukanka2022-06-07 21:33:44 +0800
committerSukanka2022-06-07 21:33:44 +0800
commit4b84dc62ab710f58555370b7f3c57423fb6ae419 (patch)
treeb5f72269c44332a6b3da14dfc488e7eb743e5507
parentf1cee8b496a21ac3c2ede39661fd8b9e0a14e7ce (diff)
downloadaur-4b84dc62ab710f58555370b7f3c57423fb6ae419.tar.gz
use java-runtime or java-environment
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD13
2 files changed, 8 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e726c3b6bc61..376dd14677b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
pkgbase = bbmap
pkgdesc = A short read aligner and other bioinformatic tools
pkgver = 38.96
- pkgrel = 1
+ pkgrel = 5
url = https://jgi.doe.gov/data-and-tools/bbtools/
arch = x86_64
license = BSD
- depends = jre8-openjdk
- depends = jdk8-openjdk
+ depends = java-environment
optdepends = env-modules: for any scripts requiring `module`
optdepends = pigz: for parallel GZIP (de)compression
optdepends = samtools: for BAM output
diff --git a/PKGBUILD b/PKGBUILD
index 4bc81cd6e402..7fe178f4ec52 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,12 @@
pkgname=bbmap
pkgver=38.96
-pkgrel=1
+pkgrel=5
pkgdesc="A short read aligner and other bioinformatic tools"
arch=('x86_64')
url=https://jgi.doe.gov/data-and-tools/bbtools/
license=('BSD')
-depends=('jre8-openjdk' 'jdk8-openjdk')
+depends=('java-environment')
optdepends=(
'env-modules: for any scripts requiring `module`'
'pigz: for parallel GZIP (de)compression'
@@ -21,13 +21,12 @@ prepare() {
make -f makefile.linux clean
}
-build() {
- cd "${srcdir}"/"${pkgname}"/jni
- # Headers for JNI are found in this Arch Linux specific location
- env JAVA_HOME=/usr/lib/jvm/default make -f makefile.linux
-}
package() {
+ cd "${srcdir}"/"${pkgname}"/jni
+ archlinux-java fix
+ # Headers for JNI are found in this Arch Linux specific location
+ env JAVA_HOME=/usr/lib/jvm/default make -f makefile.linux
cd "${srcdir}"/"${pkgname}"
mkdir -p "${pkgdir}"/usr/share/doc/"${pkgname}"/