diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 6 |
2 files changed, 6 insertions, 4 deletions
@@ -10,13 +10,13 @@ pkgbase = google-cloud-ops-agent-git makedepends = git makedepends = go makedepends = gradle - makedepends = java-environment=17 + makedepends = jdk17-openjdk makedepends = pkg-config makedepends = rsync makedepends = unzip makedepends = zip depends = libyaml - depends = java-runtime-headless + depends = jdk-openjdk provides = google-cloud-ops-agent conflicts = stackdriver-collectd source = google-cloud-ops-agent-git::git+https://github.com/GoogleCloudPlatform/ops-agent.git @@ -12,14 +12,14 @@ groups=() depends=( 'libyaml' - 'java-runtime-headless' + 'jdk-openjdk' ) makedepends=( 'cmake' 'git' 'go' 'gradle' - 'java-environment=17' + 'jdk17-openjdk' 'pkg-config' 'rsync' 'unzip' @@ -79,6 +79,8 @@ build() { git apply "${srcdir}/0002-builds_otel.sh.patch" echo "--- Building otel ..." + export JAVA_HOME='/usr/lib/jvm/java-17-openjdk' + export PATH="${JAVA_HOME}/bin:${PATH}" java --version CGO_ENABLED=1 ./builds/otel.sh "$_destdir" |