Skip to content

Commit 1c49142

Browse files
gridbugsgridbugs
committed
Wip
1 parent 7dcb20a commit 1c49142

File tree

10 files changed

+83
-18
lines changed

10 files changed

+83
-18
lines changed

‎dune-project‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
(= :version))
5959
(tsdl
6060
(>= 1))
61-
(osx-fsevents
61+
(fsevents
6262
(= :os macos))
6363
(conf-pkg-config :build)))
6464

‎dune.lock/base-bytes.pkg‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
(version base)
2+
3+
(depends ocaml ocamlfind)

‎dune.lock/cf.pkg‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
(version 0.5.0)
2+
3+
(build
4+
(progn
5+
(when
6+
%{pkg-self:dev}
7+
(run dune subst))
8+
(run
9+
dune
10+
build
11+
-p
12+
%{pkg-self:name}
13+
-j
14+
%{jobs}
15+
--promote-install-files=false
16+
@install)
17+
(run
18+
dune
19+
install
20+
-p
21+
%{pkg-self:name}
22+
--create-install-files
23+
%{pkg-self:name})))
24+
25+
(depends dune base-bytes ctypes ctypes-foreign)
26+
27+
(source
28+
(fetch
29+
(url
30+
https://github.com/mirage/ocaml-cf/releases/download/0.5.0/cf-lwt-0.5.0.tbz)
31+
(checksum
32+
sha256=d307832538a493023be3c7aceb5e9594e509d49e16f1e90dff1dc22ef46b9564)))

‎dune.lock/conf-pkg-config.pkg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(version 4)
22

33
(build
4-
(run pkg-config --help))
4+
(run pkgconf --version))
55

6-
(depexts pkg-config)
6+
(depexts pkgconf)

‎dune.lock/conf-sdl2.pkg‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@
44
(run pkg-config sdl2))
55

66
(depends conf-pkg-config)
7+
8+
(depexts sdl2)

‎dune.lock/fsevents.pkg‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
(version 0.3.0)
2+
3+
(build
4+
(progn
5+
(when
6+
%{pkg-self:dev}
7+
(run dune subst))
8+
(run dune build -p %{pkg-self:name} -j %{jobs} @install)))
9+
10+
(depends dune base-bytes cf ctypes)
11+
12+
(source
13+
(fetch
14+
(url
15+
https://github.com/mirage/ocaml-fsevents/releases/download/0.3.0/fsevents-lwt-0.3.0.tbz)
16+
(checksum
17+
sha256=0bbfea93c14e99c1dbb2bf9de2ef8c93e4f1043490df73c00f9c0a969f472b7a)))

‎dune.lock/lock.dune‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(lang package 0.1)
22

3-
(dependency_hash 65fc02995de3bdaa0333be2c42d299ce)
3+
(dependency_hash e220a85da74d9b2f1e1c28b666f7adcc)
44

55
(ocaml ocaml-base-compiler)
66

@@ -16,18 +16,17 @@
1616
(variable_values
1717
(with-doc false)
1818
(with-dev-setup false)
19-
(sys-ocaml-version 4.13.1)
19+
(sys-ocaml-version 5.3.0)
2020
(post true)
21-
(os-version 24.11)
22-
(os-distribution nixos)
23-
(os linux)
21+
(os-version 15.5)
22+
(os-distribution homebrew)
23+
(os macos)
2424
(opam-version 2.2.0~alpha-vendored)
25-
(arch x86_64))
25+
(arch arm64))
2626
(unset_variables
2727
with-test
2828
sys-ocaml-libc
2929
sys-ocaml-cc
3030
sys-ocaml-arch
31-
enable-ocaml-beta-repository
3231
dev
3332
build))

‎dune.lock/ocaml-compiler.pkg‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,19 @@
5858
(when
5959
(catch_undefined_var %{pkg:ocaml-option-tsan:installed} false)
6060
--enable-tsan)
61+
(when
62+
(catch_undefined_var
63+
(and_absorb_undefined_var
64+
(not %{pkg:ocaml-option-32bit:installed})
65+
(not %{pkg:ocaml-option-musl:installed})
66+
true)
67+
false)
68+
CC=cc)
69+
(when
70+
(catch_undefined_var
71+
(and_absorb_undefined_var %{pkg:ocaml-option-tsan:installed} true)
72+
false)
73+
CC=clang)
6174
(when
6275
(catch_undefined_var
6376
(and_absorb_undefined_var %{pkg:ocaml-option-musl:installed} true)
@@ -67,14 +80,12 @@
6780
(catch_undefined_var
6881
(and_absorb_undefined_var %{pkg:ocaml-option-musl:installed} true)
6982
false)
70-
CFLAGS=-Os)
83+
"CFLAGS=-Os -mno-outline-atomics")
7184
(when
7285
(catch_undefined_var
7386
(or_absorb_undefined_var
7487
%{pkg:ocaml-option-leak-sanitizer:installed}
75-
(and_absorb_undefined_var
76-
%{pkg:ocaml-option-address-sanitizer:installed}
77-
true))
88+
false)
7889
false)
7990
LDFLAGS=-Wl,--no-as-needed,-ldl)
8091
(when
@@ -86,12 +97,12 @@
8697
%{pkg:ocaml-option-address-sanitizer:installed}
8798
true)
8899
false)
89-
"CC=gcc -ldl -fsanitize=address -fno-omit-frame-pointer -O1 -g")
100+
"CC=clang -fsanitize=address -fno-omit-frame-pointer -O1 -g")
90101
(when
91102
(catch_undefined_var
92103
(and_absorb_undefined_var %{pkg:ocaml-option-32bit:installed} true)
93104
false)
94-
"CC=gcc -m32")
105+
"CC=gcc -Wl,-read_only_relocs,suppress -arch i386 -m32")
95106
(when
96107
(catch_undefined_var
97108
(and_absorb_undefined_var %{pkg:ocaml-option-musl:installed} true)
@@ -101,7 +112,7 @@
101112
(catch_undefined_var
102113
(and_absorb_undefined_var %{pkg:ocaml-option-32bit:installed} true)
103114
false)
104-
--host=i386-linux)
115+
--host=i386-apple-darwin13.2.0)
105116
(when
106117
(catch_undefined_var %{pkg:ocaml-option-static:installed} false)
107118
LIBS=-static)

‎llama_interactive.opam‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ depends: [
1111
"ocaml" {>= "4.13"}
1212
"llama" {= version}
1313
"tsdl" {>= "1"}
14+
"fsevents" {os = "macos"}
1415
"conf-pkg-config" {build}
1516
"odoc" {with-doc}
1617
]

‎src/interactive/dune‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
(library
22
(public_name llama_interactive)
3-
(libraries llama tsdl))
3+
(libraries llama tsdl fsevents))

0 commit comments

Comments
 (0)