aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Frankenberger <simon-alpine@fraho.eu>2021-04-24 10:28:26 +0200
committerLeo <thinkabit.ukim@gmail.com>2021-06-17 15:28:53 +0000
commit3b9402260d5dbc6501af1b02932b34aa17a737ef (patch)
tree11ede968b3d60f7ae4db31fc4b976b5ee328bc98
parent67e903939d02cd694fddf22ab29485fd291bf2e7 (diff)
community/commons-daemon: use java-provides abstractions
-rw-r--r--community/commons-daemon/APKBUILD10
1 files changed, 5 insertions, 5 deletions
diff --git a/community/commons-daemon/APKBUILD b/community/commons-daemon/APKBUILD
index 2f0d135517c..9ce3c42ee48 100644
--- a/community/commons-daemon/APKBUILD
+++ b/community/commons-daemon/APKBUILD
@@ -2,14 +2,14 @@
# Maintainer: TBK <alpine@jjtc.eu>
pkgname=commons-daemon
pkgver=1.2.4
-pkgrel=0
+pkgrel=1
pkgdesc="Tools to allow Java programs to run as UNIX daemons"
url="https://commons.apache.org/daemon/"
arch="all !mips !mips64"
license="Apache-2.0"
options="!check" # No test suite
-depends="openjdk8-jre-base"
-makedepends="docbook2x libcap-dev linux-headers maven openjdk8" # update --with-java when bumping openjdk
+depends="java-jre-headless"
+makedepends="docbook2x libcap-dev linux-headers maven java-jdk"
subpackages="$pkgname-doc jsvc:_jsvc jsvc-doc:_jsvc_doc"
source="https://mirrors.dotsrc.org/apache/commons/daemon/source/commons-daemon-$pkgver-src.tar.gz
rat_workaround.patch
@@ -26,8 +26,8 @@ build() {
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
- --with-java=/usr/lib/jvm/java-1.8-openjdk \
- CFLAGS="$CFLAGS -I/usr/lib/jvm/java-1.8-openjdk/include/linux"
+ --with-java=/usr/lib/jvm/default-jvm \
+ CFLAGS="$CFLAGS -I/usr/lib/jvm/default-jvm/include/linux"
make
# jsvc manpage