Revert "Fix conf-openblas on macOS arm64 hardware"

nberth · May 16, 2024 · f7c067e · f7c067e
1 parent b43ff81
commit f7c067e
Showing 1 changed file with 1 addition and 17 deletions.
diff --git a/packages/conf-openblas/conf-openblas.0.2.1/opam b/packages/conf-openblas/conf-openblas.0.2.1/opam
@@ -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"}
@@ -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"}
@@ -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."