Fix oraclelinux and fedora

ocaml · May 29, 2024 · 7dba3fa · 7dba3fa
1 parent 15567c8
commit 7dba3fa
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 39 deletions.
diff --git a/packages/conf-libclang/conf-libclang.10/opam b/packages/conf-libclang/conf-libclang.10/opam
@@ -20,13 +20,13 @@ depexts: [
   ["libclang-10-dev" "libclang-cpp10-dev" "llvm-10-dev"]
     {os-distribution = "ubuntu" & os-version >= "20.04"}
   ["libclang-7-dev" "llvm-7-dev"] { os-distribution = "debian" & os-version = "10" }
+  ["clang-devel-10.0.1" "llvm-devel-10.0.1" "llvm-static-10.0.1" "zlib-devel"]
+    {os-distribution = "ol" & os-version = "8"}
   ["clang-dev" "llvm-dev" "clang-static"] {os-distribution = "alpine"}
   ["clang-devel" "llvm-devel" "llvm-static" "zlib-devel"]
     {os-distribution = "centos"}
   ["clang-devel" "llvm-devel" "zlib-devel" "redhat-rpm-config"]
     {os-distribution = "fedora"}
-  ["clang-devel" "llvm-devel" "llvm-static" "zlib-devel"]
-    {os-distribution = "ol" & os-version >= "8"}
   ["llvm-clang-devel"] {os-family = "suse" | os-family = "opensuse"}
   ["sys-devel/clang"] {os-distribution = "gentoo"}
 ]
@@ -43,9 +43,8 @@ x-ci-accept-failures: [
   "debian-11" # libclang-n-dev is not available
   "debian-12" "debian-unstable" # libclang-n-dev is not available
   "debian-13" "debian-testing" # libclang-n-dev is not available
-  "fedora-38" "oraclelinux-8" # clang-devel is not available
-  "fedora-39" "oraclelinux-9" # clang-devel is not available
-  "fedora-40" # clang-devel is not available
+  "fedora-38" "fedora-39" "fedora-40" # clang-devel is not available
+  "oraclelinux-9" # clang-devel is not available
 ]
 extra-files: [
   ["utils.ml" "sha512=7c6fc56abc8ee9b85b787aaee8b28b54087c4af748b15c3c03de5dbcd253ade2e52930e0b180b883364c7302de000b2f37f9171b687868c7c52b77ced1cb00eb"]

diff --git a/packages/conf-libclang/conf-libclang.11/opam b/packages/conf-libclang/conf-libclang.11/opam
@@ -21,13 +21,15 @@ depexts: [
     {os-distribution = "ubuntu" & os-version >= "20.04"}
   ["libclang-11-dev" "libclang-cpp11-dev" "llvm-11-dev"] { os-distribution = "debian" & os-version = "11" }
   ["libclang-11-dev" "libclang-cpp11-dev" "llvm-11-dev"] { os-distribution = "debian" & os-version = "10" }
+  ["clang-devel-11.0.1" "llvm-devel-11.0.1" "llvm-static-11.0.1" "zlib-devel"]
+    {os-distribution = "ol" & os-version = "8"}
+  ["clang11-devel" "llvm11-devel" "llvm11-static" "zlib-devel"]
+    {os-distribution = "fedora"}
   ["clang-dev" "llvm-dev" "clang-static"] {os-distribution = "alpine"}
   ["clang-devel" "llvm-devel" "llvm-static" "zlib-devel"]
     {os-distribution = "centos"}
   ["clang-devel" "llvm-devel" "zlib-devel" "redhat-rpm-config"]
     {os-distribution = "fedora"}
-  ["clang-devel" "llvm-devel" "llvm-static" "zlib-devel"]
-    {os-distribution = "ol" & os-version >= "8"}
   ["llvm-clang-devel"] {os-family = "suse" | os-family = "opensuse"}
   ["sys-devel/clang"] {os-distribution = "gentoo"}
   ["devel/llvm11"] {os = "freebsd"}
@@ -43,9 +45,7 @@ x-ci-accept-failures: [
   "ubuntu-22.04" "ubuntu-22.10" "ubuntu-23.04" "ubuntu-23.10" "ubuntu-24.04" # libclang-n-dev is not available
   "debian-12" "debian-unstable" # libclang-n-dev is not available
   "debian-13" "debian-testing" # libclang-n-dev is not available
-  "fedora-38" "oraclelinux-8" # clang-devel is not available
-  "fedora-39" "oraclelinux-9" # clang-devel is not available
-  "fedora-40" # clang-devel is not available
+  "oraclelinux-9" # clang-devel is not available
 ]
 extra-files: [
   ["utils.ml" "sha512=7c6fc56abc8ee9b85b787aaee8b28b54087c4af748b15c3c03de5dbcd253ade2e52930e0b180b883364c7302de000b2f37f9171b687868c7c52b77ced1cb00eb"]

diff --git a/packages/conf-libclang/conf-libclang.12/opam b/packages/conf-libclang/conf-libclang.12/opam
@@ -24,13 +24,15 @@ depexts: [
     {os-distribution = "ubuntu" & os-version >= "20.04"}
   ["libclang-11-dev" "libclang-cpp11-dev" "llvm-11-dev"] { os-distribution = "debian" & os-version = "11" }
   ["libclang-11-dev" "libclang-cpp11-dev" "llvm-11-dev"] { os-distribution = "debian" & os-version = "10" }
+  ["clang-devel-12.0.1" "llvm-devel-12.0.1" "llvm-static-12.0.1" "zlib-devel"]
+    {os-distribution = "ol" & os-version = "8"}
+  ["clang12-devel" "llvm12-devel" "llvm12-static" "zlib-devel"]
+    {os-distribution = "fedora"}
   ["clang-dev" "llvm-dev" "clang-static"] {os-distribution = "alpine"}
   ["clang-devel" "llvm-devel" "llvm-static" "zlib-devel"]
     {os-distribution = "centos"}
   ["clang-devel" "llvm-devel" "zlib-devel" "redhat-rpm-config"]
     {os-distribution = "fedora"}
-  ["clang-devel" "llvm-devel" "llvm-static" "zlib-devel"]
-    {os-distribution = "ol" & os-version >= "8"}
   ["llvm-clang-devel"] {os-family = "suse" | os-family = "opensuse"}
   ["sys-devel/clang"] {os-distribution = "gentoo"}
   ["devel/llvm12"] {os = "freebsd"}
@@ -45,9 +47,7 @@ x-ci-accept-failures: [
   "ubuntu-22.04" "ubuntu-22.10" "ubuntu-23.04" "ubuntu-23.10" "ubuntu-24.04" # libclang-n-dev is not available
   "debian-12" "debian-unstable" # libclang-n-dev is not available
   "debian-13" "debian-testing" # libclang-n-dev is not available
-  "fedora-38" "oraclelinux-8" # clang-devel is not available
-  "fedora-39" "oraclelinux-9" # clang-devel is not available
-  "fedora-40" # clang-devel is not available
+  "oraclelinux-9" # clang-devel is not available
 ]
 extra-files: [
   ["utils.ml" "sha512=7c6fc56abc8ee9b85b787aaee8b28b54087c4af748b15c3c03de5dbcd253ade2e52930e0b180b883364c7302de000b2f37f9171b687868c7c52b77ced1cb00eb"]

diff --git a/packages/conf-libclang/conf-libclang.13/opam b/packages/conf-libclang/conf-libclang.13/opam
@@ -28,13 +28,17 @@ depexts: [
     {os-distribution = "ubuntu" & os-version = "20.04"}
   ["libclang-13-dev" "libclang-cpp13-dev" "llvm-13-dev"] { os-distribution = "debian" & os-version = "11" }
   ["libclang-13-dev" "libclang-cpp13-dev" "llvm-13-dev"] { os-distribution = "debian" & os-version = "10" }
+  ["clang-devel-13.0.1" "llvm-devel-13.0.1" "llvm-static-13.0.1" "zlib-devel"]
+    {os-distribution = "ol" & os-version = "8"}
+  ["clang-devel-13.0.1" "llvm-devel-13.0.1" "llvm-static-13.0.1" "zlib-devel"]
+    {os-distribution = "ol" & os-version = "9"}
+  ["clang13-devel" "llvm13-devel" "llvm13-static" "zlib-devel"]
+    {os-distribution = "fedora"}
   ["clang-dev" "llvm-dev" "clang-static"] {os-distribution = "alpine"}
   ["clang-devel" "llvm-devel" "llvm-static" "zlib-devel"]
     {os-distribution = "centos"}
   ["clang-devel" "llvm-devel" "zlib-devel" "redhat-rpm-config"]
     {os-distribution = "fedora"}
-  ["clang-devel" "llvm-devel" "llvm-static" "zlib-devel"]
-    {os-distribution = "ol" & os-version >= "8"}
   ["llvm-clang-devel"] {os-family = "suse" | os-family = "opensuse"}
   ["sys-devel/clang"] {os-distribution = "gentoo"}
   ["devel/llvm13"] {os = "freebsd"}
@@ -49,9 +53,6 @@ x-ci-accept-failures: [
   "ubuntu-22.04" "ubuntu-22.10" "ubuntu-23.04" "ubuntu-23.10" "ubuntu-24.04" # libclang-n-dev is not available
   "debian-12" "debian-unstable" # libclang-n-dev is not available
   "debian-13" "debian-testing" # libclang-n-dev is not available
-  "fedora-38" "oraclelinux-8" # clang-devel is not available
-  "fedora-39" "oraclelinux-9" # clang-devel is not available
-  "fedora-40" # clang-devel is not available
 ]
 extra-files: [
   ["utils.ml" "sha512=7c6fc56abc8ee9b85b787aaee8b28b54087c4af748b15c3c03de5dbcd253ade2e52930e0b180b883364c7302de000b2f37f9171b687868c7c52b77ced1cb00eb"]

diff --git a/packages/conf-libclang/conf-libclang.14/opam b/packages/conf-libclang/conf-libclang.14/opam
@@ -32,13 +32,13 @@ depexts: [
   ["libclang-14-dev" "libclang-cpp14-dev" "llvm-14-dev"] { os-distribution = "debian" & os-version = "12" }
   ["libclang-13-dev" "libclang-cpp13-dev" "llvm-13-dev"] { os-distribution = "debian" & os-version = "11" }
   ["libclang-13-dev" "libclang-cpp13-dev" "llvm-13-dev"] { os-distribution = "debian" & os-version = "10" }
+  ["clang14-devel" "llvm14-devel" "llvm14-static" "zlib-devel"]
+    {os-distribution = "fedora"}
   ["clang-dev" "llvm-dev" "clang-static"] {os-distribution = "alpine"}
   ["clang-devel" "llvm-devel" "llvm-static" "zlib-devel"]
     {os-distribution = "centos"}
   ["clang-devel" "llvm-devel" "zlib-devel" "redhat-rpm-config"]
     {os-distribution = "fedora"}
-  ["clang-devel" "llvm-devel" "llvm-static" "zlib-devel"]
-    {os-distribution = "ol" & os-version >= "8"}
   ["llvm-clang-devel"] {os-family = "suse" | os-family = "opensuse"}
   ["sys-devel/clang"] {os-distribution = "gentoo"}
   ["devel/llvm14"] {os = "freebsd"}
@@ -51,9 +51,6 @@ x-ci-accept-failures: [
   "alpine-3.16" # unavailable system package 'llvm-dev'
   "opensuse-15.3" # unavailable system package 'llvm-clang-devel'
   "debian-13" "debian-testing" # libclang-n-dev is not available
-  "fedora-38" "oraclelinux-8" # clang-devel is not available
-  "fedora-39" "oraclelinux-9" # clang-devel is not available
-  "fedora-40" # clang-devel is not available
 ]
 extra-files: [
   ["utils.ml" "sha512=7c6fc56abc8ee9b85b787aaee8b28b54087c4af748b15c3c03de5dbcd253ade2e52930e0b180b883364c7302de000b2f37f9171b687868c7c52b77ced1cb00eb"]

diff --git a/packages/conf-libclang/conf-libclang.15/opam b/packages/conf-libclang/conf-libclang.15/opam
@@ -35,13 +35,21 @@ depexts: [
   ["libclang-15-dev" "libclang-cpp15-dev" "llvm-15-dev"] { os-distribution = "debian" & os-version = "12" }
   ["libclang-13-dev" "libclang-cpp13-dev" "llvm-13-dev"] { os-distribution = "debian" & os-version = "11" }
   ["libclang-13-dev" "libclang-cpp13-dev" "llvm-13-dev"] { os-distribution = "debian" & os-version = "10" }
+  ["clang-devel-15.0.7" "llvm-devel-15.0.7" "llvm-static-15.0.7" "zlib-devel"]
+    {os-distribution = "ol" & os-version = "8"}
+  ["clang-devel-15.0.7" "llvm-devel-15.0.7" "llvm-static-15.0.7" "zlib-devel"]
+    {os-distribution = "ol" & os-version = "9"}
+  ["clang15-devel" "llvm15-devel" "llvm15-static" "zlib-devel"]
+    {os-distribution = "fedora" & os-version = "38"}
+  ["clang15-devel" "llvm15-devel" "llvm15-static" "zlib-devel"]
+    {os-distribution = "fedora" & os-version = "39"}
+  ["clang15-devel" "llvm15-devel" "llvm15-static" "zlib-devel"]
+    {os-distribution = "fedora" & os-version = "40"}
   ["clang-dev" "llvm-dev" "clang-static"] {os-distribution = "alpine"}
   ["clang-devel" "llvm-devel" "llvm-static" "zlib-devel"]
     {os-distribution = "centos"}
   ["clang-devel" "llvm-devel" "zlib-devel" "redhat-rpm-config"]
     {os-distribution = "fedora"}
-  ["clang-devel" "llvm-devel" "llvm-static" "zlib-devel"]
-    {os-distribution = "ol" & os-version >= "8"}
   ["llvm-clang-devel"] {os-family = "suse" | os-family = "opensuse"}
   ["sys-devel/clang"] {os-distribution = "gentoo"}
   ["devel/llvm15"] {os = "freebsd"}
@@ -53,9 +61,6 @@ x-ci-accept-failures: [
   "alpine-3.15" # unavailable system package 'llvm-dev'
   "alpine-3.16" # unavailable system package 'llvm-dev'
   "opensuse-15.3" # unavailable system package 'llvm-clang-devel'
-  "fedora-38" "oraclelinux-8" # clang-devel is not available
-  "fedora-39" "oraclelinux-9" # clang-devel is not available
-  "fedora-40" # clang-devel is not available
 ]
 extra-files: [
   ["utils.ml" "sha512=7c6fc56abc8ee9b85b787aaee8b28b54087c4af748b15c3c03de5dbcd253ade2e52930e0b180b883364c7302de000b2f37f9171b687868c7c52b77ced1cb00eb"]

diff --git a/packages/conf-libclang/conf-libclang.16/opam b/packages/conf-libclang/conf-libclang.16/opam
@@ -37,13 +37,21 @@ depexts: [
   ["libclang-16-dev" "libclang-cpp16-dev" "llvm-16-dev"] { os-distribution = "debian" & os-version = "12" }
   ["libclang-16-dev" "libclang-cpp16-dev" "llvm-16-dev"] { os-distribution = "debian" & os-version = "11" }
   ["libclang-13-dev" "libclang-cpp13-dev" "llvm-13-dev"] { os-distribution = "debian" & os-version = "10" }
+  ["clang-devel-16.0.6" "llvm-devel-16.0.6" "llvm-static-16.0.6" "zlib-devel"]
+    {os-distribution = "ol" & os-version = "8"}
+  ["clang-devel-16.0.6" "llvm-devel-16.0.6" "llvm-static-16.0.6" "zlib-devel"]
+    {os-distribution = "ol" & os-version = "9"}
+  ["clang15-devel" "llvm15-devel" "llvm15-static" "zlib-devel"]
+    {os-distribution = "fedora" & os-version = "38"}
+  ["clang16-devel" "llvm16-devel" "llvm16-static" "zlib-devel"]
+    {os-distribution = "fedora" & os-version = "39"}
+  ["clang16-devel" "llvm16-devel" "llvm16-static" "zlib-devel"]
+    {os-distribution = "fedora" & os-version = "40"}
   ["clang-dev" "llvm-dev" "clang-static"] {os-distribution = "alpine"}
   ["clang-devel" "llvm-devel" "llvm-static" "zlib-devel"]
     {os-distribution = "centos"}
   ["clang-devel" "llvm-devel" "zlib-devel" "redhat-rpm-config"]
     {os-distribution = "fedora"}
-  ["clang-devel" "llvm-devel" "llvm-static" "zlib-devel"]
-    {os-distribution = "ol" & os-version >= "8"}
   ["llvm-clang-devel"] {os-family = "suse" | os-family = "opensuse"}
   ["sys-devel/clang"] {os-distribution = "gentoo"}
   ["devel/llvm16"] {os = "freebsd"}
@@ -55,8 +63,6 @@ x-ci-accept-failures: [
   "alpine-3.15" # unavailable system package 'llvm-dev'
   "alpine-3.16" # unavailable system package 'llvm-dev'
   "opensuse-15.3" # unavailable system package 'llvm-clang-devel'
-  "fedora-39" "oraclelinux-9" # clang-devel is not available
-  "fedora-40" # clang-devel is not available
 ]
 extra-files: [
   ["utils.ml" "sha512=7c6fc56abc8ee9b85b787aaee8b28b54087c4af748b15c3c03de5dbcd253ade2e52930e0b180b883364c7302de000b2f37f9171b687868c7c52b77ced1cb00eb"]

diff --git a/packages/conf-libclang/conf-libclang.17/opam b/packages/conf-libclang/conf-libclang.17/opam
@@ -39,13 +39,21 @@ depexts: [
   ["libclang-16-dev" "libclang-cpp16-dev" "llvm-16-dev"] { os-distribution = "debian" & os-version = "12" }
   ["libclang-16-dev" "libclang-cpp16-dev" "llvm-16-dev"] { os-distribution = "debian" & os-version = "11" }
   ["libclang-13-dev" "libclang-cpp13-dev" "llvm-13-dev"] { os-distribution = "debian" & os-version = "10" }
+  ["clang-devel-17.0.6" "llvm-devel-17.0.6" "llvm-static-17.0.6" "zlib-devel"]
+    {os-distribution = "ol" & os-version = "8"}
+  ["clang-devel-17.0.6" "llvm-devel-17.0.6" "llvm-static-17.0.6" "zlib-devel"]
+    {os-distribution = "ol" & os-version = "9"}
+  ["clang15-devel" "llvm15-devel" "llvm15-static" "zlib-devel"]
+    {os-distribution = "fedora" & os-version = "38"}
+  ["clang16-devel" "llvm16-devel" "llvm16-static" "zlib-devel"]
+    {os-distribution = "fedora" & os-version = "39"}
+  ["clang17-devel" "llvm17-devel" "llvm17-static" "zlib-devel"]
+    {os-distribution = "fedora" & os-version = "40"}
   ["clang-dev" "llvm-dev" "clang-static"] {os-distribution = "alpine"}
   ["clang-devel" "llvm-devel" "llvm-static" "zlib-devel"]
     {os-distribution = "centos"}
   ["clang-devel" "llvm-devel" "zlib-devel" "redhat-rpm-config"]
     {os-distribution = "fedora"}
-  ["clang-devel" "llvm-devel" "llvm-static" "zlib-devel"]
-    {os-distribution = "ol" & os-version >= "8"}
   ["llvm-clang-devel"] {os-family = "suse" | os-family = "opensuse"}
   ["sys-devel/clang"] {os-distribution = "gentoo"}
   ["devel/llvm17"] {os = "freebsd"}
@@ -57,7 +65,6 @@ x-ci-accept-failures: [
   "alpine-3.15" # unavailable system package 'llvm-dev'
   "alpine-3.16" # unavailable system package 'llvm-dev'
   "opensuse-15.3" # unavailable system package 'llvm-clang-devel'
-  "fedora-40" # clang-devel is not available
 ]
 extra-files: [
   ["utils.ml" "sha512=7c6fc56abc8ee9b85b787aaee8b28b54087c4af748b15c3c03de5dbcd253ade2e52930e0b180b883364c7302de000b2f37f9171b687868c7c52b77ced1cb00eb"]

diff --git a/packages/conf-libclang/conf-libclang.18/opam b/packages/conf-libclang/conf-libclang.18/opam
@@ -41,13 +41,19 @@ depexts: [
   ["libclang-16-dev" "libclang-cpp16-dev" "llvm-16-dev"] { os-distribution = "debian" & os-version = "12" }
   ["libclang-16-dev" "libclang-cpp16-dev" "llvm-16-dev"] { os-distribution = "debian" & os-version = "11" }
   ["libclang-13-dev" "libclang-cpp13-dev" "llvm-13-dev"] { os-distribution = "debian" & os-version = "10" }
+  ["clang-devel" "llvm-devel" "llvm-static" "zlib-devel"]
+    {os-distribution = "ol" & os-version >= "8"}
+  ["clang15-devel" "llvm15-devel" "llvm15-static" "zlib-devel"]
+    {os-distribution = "fedora" & os-version = "38"}
+  ["clang16-devel" "llvm16-devel" "llvm16-static" "zlib-devel"]
+    {os-distribution = "fedora" & os-version = "39"}
+  ["clang17-devel" "llvm17-devel" "llvm17-static" "zlib-devel"]
+    {os-distribution = "fedora" & os-version = "40"}
   ["clang-dev" "llvm-dev" "clang-static"] {os-distribution = "alpine"}
   ["clang-devel" "llvm-devel" "llvm-static" "zlib-devel"]
     {os-distribution = "centos"}
   ["clang-devel" "llvm-devel" "zlib-devel" "redhat-rpm-config"]
     {os-distribution = "fedora"}
-  ["clang-devel" "llvm-devel" "llvm-static" "zlib-devel"]
-    {os-distribution = "ol" & os-version >= "8"}
   ["llvm-clang-devel"] {os-family = "suse" | os-family = "opensuse"}
   ["sys-devel/clang"] {os-distribution = "gentoo"}
   ["devel/llvm18"] {os = "freebsd"}