Skip to content

Commit

Permalink
Merge pull request #25980 from jmid/conf-openjdk-expand
Browse files Browse the repository at this point in the history
conf-openjdk: add Ubuntu-family support
  • Loading branch information
dinosaure authored Aug 22, 2024
2 parents f232885 + cde4bfd commit 5100ab4
Showing 1 changed file with 19 additions and 2 deletions.
21 changes: 19 additions & 2 deletions packages/conf-openjdk/conf-openjdk.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,32 @@ authors: "OpenJDK and Java Community"
license: "GPLv2 with linking exception"
build: ["javac" "-version"]
depexts: [
["default-jdk"] {os-family = "debian"}
["default-jdk"] {os-family = "debian" | os-family = "ubuntu"}
["java-latest-openjdk-devel"] {os-distribution = "fedora"}
["java-latest-openjdk-devel"] {os-distribution = "rhel"}
["java-latest-openjdk-devel"] {os-distribution = "ol"}
["java-latest-openjdk-devel"] {os-distribution = "centos"}
["jdk-openjdk"] {os-distribution = "arch"}
["openjdk"] {os-distribution = "freebsd"}
["openjdk"] {os-distribution = "homebrew" & os = "macos"}
]
x-ci-accept-failures: [
# requires the user to install a specific openjdk version
"freebsd"
# these fail CI as PATH does not include javac
"alpine-3.20"
"opensuse-15.6"
"opensuse-tumbleweed"
"macos-homebrew"
# x86_32 is debian-12-ocaml-4.14/i386
"debian-12"
]
post-messages: [
"Please ensure that the javac binary is installed and is available in PATH"
{failure}
"""
You may need to first install a version of openjdk, e.g., openjdk19"""
{failure & os-distribution = "freebsd"}
]
synopsis: "Virtual package relying on OpenJDK / Javac"
description:
"This package can only install if the javac binary is installed on the system."
Expand Down

0 comments on commit 5100ab4

Please sign in to comment.