Skip to content

Commit f6590e5

Browse files
authored
Merge pull request ocaml#23480 from dra27/fix-ocamlfind.1.9.6
Fix ocamlfind.1.9.6 upgrade
2 parents 25bba47 + 99f0901 commit f6590e5

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff a/configure b/configure
2+
--- a/configure
3+
+++ b/configure
4+
@@ -294,7 +294,7 @@
5+
# If findlib has been configured -sitelib $(ocamlc -where) then there's
6+
# nothing to do, but otherwise we need to put OCaml's Standard Library
7+
# into the path setting.
8+
- if [ ! -e "${ocaml_sitelib}/stdlib/META" ]; then
9+
+ if [ ! -e "${ocaml_sitelib}/stdlib.cmi" ]; then
10+
ocamlpath="${ocaml_core_stdlib}${path_sep}${ocamlpath}"
11+
fi
12+
fi

packages/ocamlfind/ocamlfind.1.9.6/opam

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ authors: "Gerd Stolpmann <[email protected]>"
1313
homepage: "http://projects.camlcity.org/projects/findlib.html"
1414
bug-reports: "https://github.com/ocaml/ocamlfind/issues"
1515
depends: [
16-
"ocaml" {>= "4.00.0"}
16+
"ocaml" {>= "3.08.0"}
1717
]
1818
depopts: ["graphics"]
1919
build: [
@@ -34,6 +34,9 @@ install: [
3434
[make "install"]
3535
["install" "-m" "0755" "ocaml-stub" "%{bin}%/ocaml"] {ocaml:preinstalled}
3636
]
37+
extra-files: ["0001-Harden-test-for-OCaml-5.patch" "md5=3cddbf72164c29d4e50e077a92a37c6c"]
38+
# See https://github.com/ocaml/ocamlfind/pull/61
39+
patches: ["0001-Harden-test-for-OCaml-5.patch"]
3740
dev-repo: "git+https://github.com/ocaml/ocamlfind.git"
3841
url {
3942
src: "http://download.camlcity.org/download/findlib-1.9.6.tar.gz"
@@ -42,4 +45,4 @@ url {
4245
"sha512=cfaf1872d6ccda548f07d32cc6b90c3aafe136d2aa6539e03143702171ee0199add55269bba894c77115535dc46a5835901a5d7c75768999e72db503bfd83027"
4346
]
4447
}
45-
48+
available: os != "win32"

0 commit comments

Comments
 (0)