fix(CI): fix static builds and some specific deps

ocaml-sf · Jul 25, 2024 · 9da4406 · 9da4406
1 parent 58afa4f
commit 9da4406
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -31,7 +31,7 @@ RUN opam install . --destdir /home/opam/install-prefix --locked
 FROM alpine:3.13 as client
 
 RUN apk update \
-  && apk add ncurses-libs libev dumb-init openssl \
+  && apk add ncurses-libs libev dumb-init libssl3 libcrypto3 \
   && addgroup learn-ocaml \
   && adduser learn-ocaml -DG learn-ocaml
 

diff --git a/learn-ocaml-client.opam b/learn-ocaml-client.opam
@@ -45,6 +45,7 @@ depends: [
   "ssl" {>= "0.5.12"}
   "vg"
   "asak" {>= "0.5"}
+  "js_of_ocaml" {>= "5.0.0"}
 ]
 build: [
   ["dune" "build" "@install" "-p" name "-j" jobs]

diff --git a/learn-ocaml.opam b/learn-ocaml.opam
@@ -34,8 +34,8 @@ depends: [
   "easy-format" {>= "1.3.0" }
   "ezjsonm"
   "ipaddr" {>= "2.9.0" }
-  "js_of_ocaml" {>= "3.3.0" & != "3.10.0"}
-  "js_of_ocaml-compiler" {>= "3.3.0"}
+  "js_of_ocaml" {>= "5.0.0"}
+  "js_of_ocaml-compiler" {>= "5.0.0"}
   "js_of_ocaml-lwt"
   "js_of_ocaml-ppx"
   "js_of_ocaml-toplevel"

diff --git a/src/main/linking_flags.sh b/src/main/linking_flags.sh
@@ -52,7 +52,7 @@ case $(uname -s) in
     Linux)
         case $(. /etc/os-release && echo $ID) in
             alpine)
-                COMMON_LIBS="camlstr ssl_stubs ssl crypto cstruct_stubs bigstringaf_stubs lwt_unix_stubs unix c"
+                COMMON_LIBS="camlstrnat ssl_stubs ssl crypto cstruct_stubs bigstringaf_stubs lwt_unix_stubs unixnat c"
                 # `m` and `pthread` are built-in musl
                 echo2 '(-noautolink'
                 echo2 ' -cclib -Wl,-Bstatic'
@@ -68,7 +68,7 @@ case $(uname -s) in
         esac
         ;;
     Darwin)
-        COMMON_LIBS="camlstr ssl_stubs /usr/local/opt/openssl/lib/libssl.a /usr/local/opt/openssl/lib/libcrypto.a cstruct_stubs bigstringaf_stubs lwt_unix_stubs unix"
+        COMMON_LIBS="camlstrnat ssl_stubs /usr/local/opt/openssl/lib/libssl.a /usr/local/opt/openssl/lib/libcrypto.a cstruct_stubs bigstringaf_stubs lwt_unix_stubs unixnat"
         # `m` and `pthread` are built-in in libSystem
         echo2 '(-noautolink'
         for l in $EXTRA_LIBS $COMMON_LIBS; do