Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -91,19 +91,21 @@ $(TOOLDIR_FINAL)/$(MAKECONF_TARGET_ARCH)-solo5-ocaml-%: \
toolchains: $(TOOLCHAIN_FOR_BUILD) $(TOOLCHAIN_FINAL)

# OCAML
# Extract sources from the ocaml-src package and apply patches if there any in
# `patches/<OCaml version>/`
# Extract sources from the ocaml-src package
ocaml:
# First make sure the ocaml directory doesn't exist, otherwise the cp would
# create an ocaml-src subdirectory
test ! -d $@
cp -r "$$(ocamlfind query ocaml-src)" $@
VERSION="$$(head -n1 ocaml/VERSION | cut -d '.' -f 1-2)" ; \
if test -d "patches/$$VERSION" ; then \
opatch -v -C $@ "patches/$$VERSION"/*; \
fi

ocaml/Makefile.config: $(LIBS) $(TOOLCHAIN_FOR_BUILD) | ocaml
sed -e 's/#define Max_domains_def 128/#define Max_domains_def 1/' ocaml/runtime/caml/domain.h > ocaml/runtime/caml/domain.h.sed && \
mv ocaml/runtime/caml/domain.h.sed ocaml/runtime/caml/domain.h
sed -e 's/#define Max_domains_max 4096/#define Max_domains_max 1/' ocaml/runtime/caml/domain.h > ocaml/runtime/caml/domain.h.sed && \
mv ocaml/runtime/caml/domain.h.sed ocaml/runtime/caml/domain.h
sed -e 's/ostype="None"/ostype="$$(ocamlc -config-var os_type)"/' ocaml/configure > ocaml/configure.sed && \
mv ocaml/configure.sed ocaml/configure
chmod +x ocaml/configure
PATH="$$PWD/$(TOOLDIR_FOR_BUILD):$$PATH" ; \
cd ocaml && \
./configure \
Expand Down
3 changes: 1 addition & 2 deletions ocaml-solo5-cross-aarch64.opam
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,9 @@ run-test: [
[make "test"]
]
depends: [
"opatch" {build} # to patch the compiler sources
"ocamlfind" {build}
"ocaml-src" {build}
"ocaml" {>= "5.5.2" & < "5.6"}
"ocaml" {>= "5.5" & < "5.6"}
"solo5" {>= "0.9.1"}
"solo5-cross-aarch64" {>= "0.9.1" }
]
Expand Down
3 changes: 1 addition & 2 deletions ocaml-solo5.opam
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,9 @@ run-test: [
[make "test"]
]
depends: [
"opatch" {build} # to patch the compiler sources
"ocamlfind" {build}
"ocaml-src" {build}
"ocaml" {>= "5.5.2" & < "5.6"}
"ocaml" {>= "5.5" & < "5.6"}
"solo5" {>= "0.9.1"}
]
conflicts: [
Expand Down
39 changes: 0 additions & 39 deletions patches/5.5/0001-Use-the-same-os_type-as-the-host.patch

This file was deleted.

44 changes: 0 additions & 44 deletions patches/5.5/0003-Set-Max_domains_-def-max-to-1.patch

This file was deleted.

Loading