Merge pull request ocaml#22694 from thierry-martinez/fix_no_libclang-cpp-dev

[conf-libclang] Fix no libclang-cpp-dev in old Debian and Ubuntu

Author: mseri

packages/conf-libclang/conf-libclang.13/files/configure.sh

@@ -19,6 +19,7 @@ for version in default 13 12 11 10 9 8 7 6 5 4 3; do
            brew_llvm_config="$(brew --cellar)"/llvm*/${version}*/bin/llvm-config || true
            brew_llvm_config_at="$(brew --cellar)"/llvm@${version}/${version}*/bin/llvm-config || true
         fi
+        llvm_version=""
         for llvm_config in \
             llvm-config-${version} llvm-config-${version}.0 \
             llvm-config${version}0 llvm-config${version} \

packages/conf-libclang/conf-libclang.13/opam

@@ -15,8 +15,10 @@ depexts: [
     {(os-distribution = "debian" & os-version >= "12") |
      (os-distribution = "ubuntu" & os-version >= "22.04")}
   ["libclang-dev" "libclang-cpp-dev" "llvm-dev"] {
+     os-distribution = "debian" & os-version >= "11"}
+  ["libclang-dev" "llvm-dev"] {
      os-family = "debian" &
-     !(os-distribution = "debian" & os-version >= "12") &
+     !(os-distribution = "debian" & os-version >= "11") &
      !(os-distribution = "ubuntu" & os-version >= "22.04")}
   ["clang-dev" "llvm-dev" "clang-static"] {os-distribution = "alpine"}
   ["clang-devel" "llvm-devel" "llvm-static" "zlib-devel"]
@@ -40,7 +42,7 @@ x-ci-accept-failures: [
   "opensuse-15.3" # unavailable system package 'llvm-clang-devel'
 ]
 extra-files: [[
-  "configure.sh" "sha512=70cc1707be92274de1072551ee1175fc25c0157a916fd3f965cdcb7a94e6dfe0962bc7baff7a578ccb5595891ce691fc7a33442536eaa8744b92c9e896cd8dcb"
+  "configure.sh" "sha512=94c9d19667bda6ab913e5ad62ff6559d6e0a5cf95e4403065619ed299ac522679bf1f4c9d03c27bb57c7736e9c6edebf0a796edc33bd46816a665209903e2710"
 ]]
 synopsis: "Virtual package relying on the installation of llvm and clang libraries (<= 13.0.x)"
 flags: conf

packages/conf-libclang/conf-libclang.14/files/configure.sh

@@ -40,6 +40,7 @@ for version in default $(seq $maximum_version -1 3); do
            brew_llvm_config="$(brew --cellar llvm)"/${version}*/bin/llvm-config || true
            brew_llvm_config_at="$(brew --cellar llvm@${version})"/${version}*/bin/llvm-config || true
         fi
+        llvm_version=""
         for llvm_config in \
             llvm-config-${version} llvm-config-${version}.0 \
             llvm-config${version}0 llvm-config${version} \

packages/conf-libclang/conf-libclang.14/opam

@@ -10,19 +10,23 @@ build: [
 ]
 depexts: [
   ["llvm@14"] {os = "macos"}
-  ["llvm" "clang"] {os-distribution = "arch"}
+  ["llvm14" "clang14"] {os-distribution = "arch"}
   ["libclang-14-dev" "libclang-cpp14-dev" "llvm-14-dev"]
     {(os-distribution = "debian" & os-version >= "12") |
      (os-distribution = "ubuntu" & os-version >= "22.04")}
   ["libclang-dev" "libclang-cpp-dev" "llvm-dev"] {
+     os-distribution = "debian" & os-version >= "11"}
+  ["libclang-dev" "llvm-dev"] {
      os-family = "debian" &
-     !(os-distribution = "debian" & os-version >= "12") &
+     !(os-distribution = "debian" & os-version >= "11") &
      !(os-distribution = "ubuntu" & os-version >= "22.04")}
   ["clang-dev" "llvm-dev" "clang-static"] {os-distribution = "alpine"}
   ["clang-devel" "llvm-devel" "llvm-static" "zlib-devel"]
     {os-distribution = "centos"}
+  ["clang14-devel" "llvm14-devel" "zlib-devel" "redhat-rpm-config"]
+    {os-distribution = "fedora" & os-version >= "37"}
   ["clang-devel" "llvm-devel" "zlib-devel" "redhat-rpm-config"]
-    {os-distribution = "fedora"}
+    {os-distribution = "fedora" & os-version < "37"}
   ["clang-devel" "llvm-devel" "llvm-static" "zlib-devel"]
     {os-distribution = "ol" & os-version >= "8"}
   ["llvm-clang-devel"] {os-family = "suse"}
@@ -36,7 +40,7 @@ x-ci-accept-failures: [
   "opensuse-15.3" # unavailable system package 'llvm-clang-devel'
 ]
 extra-files: [[
-  "configure.sh" "sha512=11d2a1abca89411efa218730490cb076a8400e266bfc1bdef5b4e60a84f2afe44dbd9036c8a1d9306046e0933430a6b06d31f5e04b97abb9d6fd08431ddae882"
+  "configure.sh" "sha512=27a0ddec4e5ccf895a279b910c7e0fe130f9b680d4771c409161d6ed5ebefcdc94d54fcb7625c40e49f83a6e1c5c4511b29ab8ddc3ce09f27ca8f77daf2c65be"
 ]]
 synopsis: "Virtual package relying on the installation of llvm and clang libraries (<= 14.0.x)"
 flags: conf

packages/conf-libclang/conf-libclang.15/files/configure.sh

@@ -127,5 +127,5 @@ EOF
     exit 0
 done
 
-echo "Error: No usable version of LLVM <=14.0.x found."
+echo "Error: No usable version of LLVM <=15.0.x found."
 exit 1

packages/conf-libclang/conf-libclang.15/opam

@@ -17,8 +17,10 @@ depexts: [
     {(os-distribution = "debian" & os-version >= "12") |
      (os-distribution = "ubuntu" & os-version = "22.04")}
   ["libclang-dev" "libclang-cpp-dev" "llvm-dev"] {
+     os-distribution = "debian" & os-version >= "11"}
+  ["libclang-dev" "llvm-dev"] {
      os-family = "debian" &
-     !(os-distribution = "debian" & os-version >= "12") &
+     !(os-distribution = "debian" & os-version >= "11") &
      !(os-distribution = "ubuntu" & os-version >= "22.04")}
   ["clang-dev" "llvm-dev" "clang-static"] {os-distribution = "alpine"}
   ["clang-devel" "llvm-devel" "llvm-static" "zlib-devel"]
@@ -40,7 +42,7 @@ x-ci-accept-failures: [
   "opensuse-15.3" # unavailable system package 'llvm-clang-devel'
 ]
 extra-files: [[
-  "configure.sh" "sha512=e94dc4cf5eff11f0b845b03dd7995714d819b2f55f0a0ae387d266c49a2f8d3602cb311c980587daf17b5767498fbff8ab20f66bd1427bf45aff74620bef515c"
+  "configure.sh" "sha512=fe42feb01df29147397d9b29afd1da118ad9e7959fb1284e141edd6555b9eaea2a08b55ef400553208cd14ac214b44c131cad7b9e0a93bd5da7548abbf374a32"
 ]]
 synopsis: "Virtual package relying on the installation of llvm and clang libraries (<= 15.0.x)"
 flags: conf