Skip to content

Commit

Permalink
Merge pull request #25195 from ocaml/revert-25076-macOS-conf-openblas
Browse files Browse the repository at this point in the history
Revert "Fix conf-openblas on macOS arm64 hardware"
  • Loading branch information
mseri authored Feb 7, 2024
2 parents 8649853 + e7f03b9 commit 0a57930
Showing 1 changed file with 1 addition and 17 deletions.
18 changes: 1 addition & 17 deletions packages/conf-openblas/conf-openblas.0.2.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,7 @@ build: [
[
"sh"
"-exc"
"printf 'opam-version: \"2.0\"\\nvariables {\\n pkg-config-homebrew: \"%s/lib/pkgconfig\"\\n}' \"$(brew --prefix openblas)\" > %{_:name}%.config"
] {os = "macos" & os-distribution = "homebrew"}
[
"sh"
"-exc"
"printf 'opam-version: \"2.0\"\\nvariables {\\n pkg-config-homebrew: \"\"\\n}' > %{_:name}%.config"
] {os != "macos" | os-distribution != "homebrew"}
[
"sh"
"-exc"
"cc $CFLAGS $(PKG_CONFIG_PATH=\"$(brew --prefix openblas)/lib/pkgconfig:$PKG_CONFIG_PATH\" pkg-config --cflags openblas) test.c $(PKG_CONFIG_PATH=\"$(brew --prefix openblas)/lib/pkgconfig:$PKG_CONFIG_PATH\" pkg-config --libs openblas)"
"cc $CFLAGS $(pkg-config --cflags openblas) test.c $(pkg-config --libs openblas)"
] {os = "macos" & os-distribution = "homebrew"}
["sh" "-exc" "cc $CFLAGS test.c -lcblas"]
{os-family = "arch"}
Expand All @@ -31,9 +21,6 @@ build: [
["sh" "-exc" "cc $CFLAGS test.c -lopenblas"]
{os-distribution != "fedora" & os-distribution != "centos" & os-family != "suse" & os-family != "opensuse" & os != "macos" & os-family != "arch" & os != "freebsd" & os != "win32"}
]
depends: [
"conf-pkg-config" {os = "macos" & os-distribution = "homebrew"}
]
depexts: [
["libc-dev" "openblas-dev" "lapack-dev"] {os-distribution = "alpine"}
["epel-release" "openblas-devel"] {os-distribution = "centos"}
Expand All @@ -48,9 +35,6 @@ x-ci-accept-failures: [
"oraclelinux-7"
"oraclelinux-8"
]
setenv: [
PKG_CONFIG_PATH += "%{_:pkg-config-homebrew}%"
]
synopsis: "Virtual package to install OpenBLAS and LAPACKE"
description:
"The package prepares OpenBLAS (CBLAS) and LAPACKE backend for Owl (OCaml numerical library). It can only be installed if OpenBLAS and LAPACKE are installed on the system."
Expand Down

0 comments on commit 0a57930

Please sign in to comment.