Skip to content

Commit

Permalink
Add patch for correct replacement of OCAML_OS_TYPE in sys.mlp (ocaml-…
Browse files Browse the repository at this point in the history
…windows64.4.08.0 only)
  • Loading branch information
AltGr committed Sep 18, 2019
1 parent e900918 commit 99b9649
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
From bb9fa36e3f02e45499819b537f8438de83df377d Mon Sep 17 00:00:00 2001
From: Louis Gesbert <louis.gesbert@ocamlpro.com>
Date: Wed, 18 Sep 2019 10:52:13 +0200
Subject: [PATCH] Fix OCAML_OS_TYPE not being replaced

---
stdlib/Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/stdlib/Makefile b/stdlib/Makefile
index 67dc8bc47..34843f49c 100644
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -234,7 +234,9 @@ stdlib.p.cmxa: $(OBJS:.cmo=.p.cmx)
$(CAMLOPT) -a -o $@ $^

sys.ml: $(ROOTDIR)/VERSION sys.mlp
- sed -e "s|%%VERSION%%|`sed -e 1q $< | tr -d '\r'`|" sys.mlp > $@
+ sed -e "s|%%VERSION%%|`sed -e 1q $< | tr -d '\r'`|" \
+ -e "s|%%OCAML_OS_TYPE%%|${OCAML_OS_TYPE}|g" \
+ sys.mlp > $@

.PHONY: clean
clean::
--
2.11.0

3 changes: 3 additions & 0 deletions packages/ocaml-windows64/ocaml-windows64.4.08.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ patches: [
"patches/use-host-ocamldoc.patch"
"patches/use-host-ocamlrun.patch"
"patches/no-ocamltest.patch"
"patches/0001-Fix-OCAML_OS_TYPE-not-being-replaced.patch"
]
substs: [
"Makefile.cross"
Expand Down Expand Up @@ -50,6 +51,8 @@ extra-files: [
"patches/avoid-cygwin-specifics.patch"
"md5=a57e6a27b28010f740fcca2399bb83ca"
]
["patches/0001-Fix-OCAML_OS_TYPE-not-being-replaced.patch"
"md5=a06cd097a8b8f73e2f617f8ad1065753"]
]
url {
src: "https://github.com/ocaml/ocaml/archive/4.08.0.tar.gz"
Expand Down

0 comments on commit 99b9649

Please sign in to comment.