Merge pull request ocaml#23331 from kit-ty-kate/fix-157

kit-ty-kate · web-flow · commit a0ac569e24e6 · 2023-02-16T14:25:02.000Z
Fix brew 4.0+ sandbox related failures
diff --git a/packages/conf-bison/conf-bison.2/opam b/packages/conf-bison/conf-bison.2/opam
@@ -14,6 +14,7 @@ authors: [
   "Alex Rozenman"
   "Paul Eggert"
 ]
+build-env: [HOMEBREW_NO_INSTALL_FROM_API = "1"]
 build: [
   ["bison" "--version"] {os-family != "homebrew"}
   ["sh" "-c" "\"$(brew --prefix bison)/bin/bison\" --version"] {os-family = "homebrew"}
diff --git a/packages/conf-flex/conf-flex.2/opam b/packages/conf-flex/conf-flex.2/opam
@@ -4,6 +4,7 @@ homepage: "https://github.com/westes/flex"
 bug-reports: "https://github.com/westes/flex/issues"
 license: "https://github.com/westes/flex/blob/master/COPYING"
 authors: "The Flex Project"
+build-env: [HOMEBREW_NO_INSTALL_FROM_API = "1"]
 build: [
   ["flex" "--version"] {os-family != "homebrew"}
   ["sh" "-c" "\"$(brew --prefix flex)/bin/flex\" --version"] {os-family = "homebrew"}
diff --git a/packages/conf-libclang/conf-libclang.1.0.0/opam b/packages/conf-libclang/conf-libclang.1.0.0/opam
@@ -4,6 +4,7 @@ authors: "The LLVM team"
 homepage: "http://llvm.org"
 bug-reports: "https://llvm.org/bugs/"
 license: "MIT"
+build-env: [HOMEBREW_NO_INSTALL_FROM_API = "1"]
 build: [
   ["bash" "-ex" "configure.sh" version]
 ]
diff --git a/packages/conf-libclang/conf-libclang.10/opam b/packages/conf-libclang/conf-libclang.10/opam
@@ -4,6 +4,7 @@ authors: "The LLVM team"
 homepage: "http://llvm.org"
 bug-reports: "https://llvm.org/bugs/"
 license: "MIT"
+build-env: [HOMEBREW_NO_INSTALL_FROM_API = "1"]
 build: [
   ["bash" "-ex" "configure.sh" version]
 ]
diff --git a/packages/conf-libclang/conf-libclang.11/opam b/packages/conf-libclang/conf-libclang.11/opam
@@ -4,6 +4,7 @@ authors: "The LLVM team"
 homepage: "http://llvm.org"
 bug-reports: "https://llvm.org/bugs/"
 license: "MIT"
+build-env: [HOMEBREW_NO_INSTALL_FROM_API = "1"]
 build: [
   ["bash" "-ex" "configure.sh" version]
 ]
diff --git a/packages/conf-libclang/conf-libclang.12/opam b/packages/conf-libclang/conf-libclang.12/opam
@@ -4,6 +4,7 @@ authors: "The LLVM team"
 homepage: "http://llvm.org"
 bug-reports: "https://llvm.org/bugs/"
 license: "MIT"
+build-env: [HOMEBREW_NO_INSTALL_FROM_API = "1"]
 build: [
   ["bash" "-ex" "configure.sh" version]
 ]
diff --git a/packages/conf-libclang/conf-libclang.13/opam b/packages/conf-libclang/conf-libclang.13/opam
@@ -4,6 +4,7 @@ authors: "The LLVM team"
 homepage: "http://llvm.org"
 bug-reports: "https://llvm.org/bugs/"
 license: "MIT"
+build-env: [HOMEBREW_NO_INSTALL_FROM_API = "1"]
 build: [
   ["bash" "-ex" "configure.sh" version]
 ]
diff --git a/packages/conf-libclang/conf-libclang.14/opam b/packages/conf-libclang/conf-libclang.14/opam
@@ -4,6 +4,7 @@ authors: "The LLVM team"
 homepage: "http://llvm.org"
 bug-reports: "https://llvm.org/bugs/"
 license: "MIT"
+build-env: [HOMEBREW_NO_INSTALL_FROM_API = "1"]
 build: [
   ["bash" "-ex" "configure.sh" version]
 ]
diff --git a/packages/conf-libclang/conf-libclang.15/opam b/packages/conf-libclang/conf-libclang.15/opam
@@ -4,6 +4,7 @@ authors: "The LLVM team"
 homepage: "http://llvm.org"
 bug-reports: "https://llvm.org/bugs/"
 license: "MIT"
+build-env: [HOMEBREW_NO_INSTALL_FROM_API = "1"]
 build: [
   ["bash" "-ex" "configure.sh" version]
 ]
diff --git a/packages/conf-libssl/conf-libssl.1/opam b/packages/conf-libssl/conf-libssl.1/opam
@@ -4,6 +4,7 @@ authors: ["The OpenSSL Project"]
 bug-reports: "https://github.com/ocaml/opam-repository/issues"
 homepage: "https://www.openssl.org/"
 license: "Apache-1.0"
+build-env: [HOMEBREW_NO_INSTALL_FROM_API = "1"]
 build: [
   ["pkg-config" "openssl"]
     {os != "macos" & os != "freebsd" & os != "openbsd" & os != "netbsd"}
diff --git a/packages/conf-libssl/conf-libssl.2/opam b/packages/conf-libssl/conf-libssl.2/opam
@@ -4,6 +4,7 @@ authors: ["The OpenSSL Project"]
 bug-reports: "https://github.com/ocaml/opam-repository/issues"
 homepage: "https://www.openssl.org/"
 license: "Apache-1.0"
+build-env: [HOMEBREW_NO_INSTALL_FROM_API = "1"]
 build: [
   ["pkg-config" "openssl"]
     {os != "freebsd" & os != "openbsd" & os != "netbsd"} # libssl is provided by base system on BSDs
diff --git a/packages/conf-libssl/conf-libssl.3/opam b/packages/conf-libssl/conf-libssl.3/opam
@@ -4,6 +4,7 @@ authors: ["The OpenSSL Project"]
 bug-reports: "https://github.com/ocaml/opam-repository/issues"
 homepage: "https://www.openssl.org/"
 license: "Apache-1.0"
+build-env: [HOMEBREW_NO_INSTALL_FROM_API = "1"]
 build: [
   ["pkg-config" "--print-errors" "--exists" "openssl"]
     {os != "freebsd" & os != "openbsd" & os != "netbsd" & # libssl is provided by base system on BSDs
diff --git a/packages/conf-libssl/conf-libssl.4/opam b/packages/conf-libssl/conf-libssl.4/opam
@@ -4,6 +4,7 @@ authors: ["The OpenSSL Project"]
 bug-reports: "https://github.com/ocaml/opam-repository/issues"
 homepage: "https://www.openssl.org/"
 license: "Apache-1.0"
+build-env: [HOMEBREW_NO_INSTALL_FROM_API = "1"]
 build: [
   ["pkg-config" "--print-errors" "--exists" "openssl"]
     {os != "freebsd" & os != "openbsd" & os != "netbsd" & # libssl is provided by base system on BSDs
diff --git a/packages/conf-qt/conf-qt.5.2.1/opam b/packages/conf-qt/conf-qt.5.2.1/opam
@@ -10,6 +10,7 @@ dev-repo: "git+https://github.com/Kakadu/lablqml.git"
 #setenv: [ PATH += "/usr/lib64/qt5/bin:/usr/lib/qt5/bin"] #{ os-distribution = "alpine" | os-distribution = "centos" | os-distribution = "fedora" }
 
 extra-files: [ "configure.sh" "md5=78ed05ba24ce4c1f929276bdefef8818" ]
+build-env: [HOMEBREW_NO_INSTALL_FROM_API = "1"]
 build: [
   ["sh" "-ex" "./configure.sh" "%{version}%" ]
     { os="macos" | os-family="debian" | os-distribution = "arch"  }

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ authors: [`
`14`	`14`	`"Alex Rozenman"`
`15`	`15`	`"Paul Eggert"`
`16`	`16`	`]`
	`17`	`+build-env: [HOMEBREW_NO_INSTALL_FROM_API = "1"]`
`17`	`18`	`build: [`
`18`	`19`	`["bison" "--version"] {os-family != "homebrew"}`
`19`	`20`	`["sh" "-c" "\"$(brew --prefix bison)/bin/bison\" --version"] {os-family = "homebrew"}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ authors: "The LLVM team"`
`4`	`4`	`homepage: "http://llvm.org"`
`5`	`5`	`bug-reports: "https://llvm.org/bugs/"`
`6`	`6`	`license: "MIT"`
	`7`	`+build-env: [HOMEBREW_NO_INSTALL_FROM_API = "1"]`
`7`	`8`	`build: [`
`8`	`9`	`["bash" "-ex" "configure.sh" version]`
`9`	`10`	`]`