Skip to content

Commit f161907

Browse files
committed
Use a patch instead of sed
1 parent 7c59367 commit f161907

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-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: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ depends: [
1717
]
1818
depopts: ["graphics"]
1919
build: [
20-
# See https://github.com/ocaml/ocamlfind/pull/61
21-
["sed" "-ib" "s|stdlib/META|stdlib.cmi|" "configure"]
2220
[
2321
"./configure"
2422
"-bindir" bin
@@ -36,6 +34,9 @@ install: [
3634
[make "install"]
3735
["install" "-m" "0755" "ocaml-stub" "%{bin}%/ocaml"] {ocaml:preinstalled}
3836
]
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"]
3940
dev-repo: "git+https://github.com/ocaml/ocamlfind.git"
4041
url {
4142
src: "http://download.camlcity.org/download/findlib-1.9.6.tar.gz"

0 commit comments

Comments
 (0)