Merge pull request #472 from pfitaxel/bump-ssl

deps(opam): Bump `ssl` version, fixes FTBFS on macOS
ocaml-sf · Mar 6, 2022 · 19a8e1a · 19a8e1a
2 parents 28ad355 + 38809a5
commit 19a8e1a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/learn-ocaml-client.opam b/learn-ocaml-client.opam
@@ -28,11 +28,12 @@ depends: [
   "dune" {>= "2.3.0"}
   "ezjsonm"
   "gg"
-  "ipaddr" {= "2.8.0" }
+  "ipaddr" {= "2.9.0" }
   "lwt" {>= "4.0.0"}
   "lwt_ssl"
   "ocaml" {(>= "4.12") & (< "4.13~")}
   "ocamlfind" {build}
+  "ocaml-migrate-parsetree" {= "1.8.0"}
   "ocp-indent-nlfork"
   "ocplib-json-typed" {>= "0.7"}
   "ocp-ocamlres" {>= "0.4"}
@@ -41,7 +42,7 @@ depends: [
   "ppxlib"
   "ppx_sexp_conv"
   "ppx_tools"
-  "ssl" {= "0.5.5"}
+  "ssl" {= "0.5.10"}
   "vg"
 ]
 build: [

diff --git a/learn-ocaml-client.opam.locked b/learn-ocaml-client.opam.locked
@@ -55,7 +55,7 @@ depends: [
   "fmt" {= "0.8.9"}
   "gg" {= "0.9.3"}
   "hex" {= "1.4.0"}
-  "ipaddr" {= "2.8.0"}
+  "ipaddr" {= "2.9.0"}
   "jbuilder" {= "1.0+beta20.2"}
   "js_of_ocaml" {= "3.9.0"}
   "js_of_ocaml-compiler" {= "3.9.1"}
@@ -95,7 +95,7 @@ depends: [
   "seq" {= "0.2.2"}
   "sexplib" {= "v0.14.0"}
   "sexplib0" {= "v0.14.0"}
-  "ssl" {= "0.5.5"}
+  "ssl" {= "0.5.10"}
   "stdlib-shims" {= "0.3.0"}
   "stringext" {= "1.6.0"}
   "topkg" {= "1.0.3"}

diff --git a/learn-ocaml.opam b/learn-ocaml.opam
@@ -30,7 +30,7 @@ depends: [
   "dune" {>= "2.3.0"}
   "easy-format" {>= "1.3.0" }
   "ezjsonm"
-  "ipaddr" {>= "2.8.0" }
+  "ipaddr" {= "2.9.0" }
   "js_of_ocaml" {>= "3.3.0" & != "3.10.0"}
   "js_of_ocaml-compiler" {>= "3.3.0"}
   "js_of_ocaml-lwt"
@@ -45,6 +45,7 @@ depends: [
   "markup-lwt"
   "ocaml" {(>= "4.12") & (< "4.13~")}
   "ocamlfind" {build}
+  "ocaml-migrate-parsetree" {= "1.8.0"}
   "ocp-indent-nlfork"
   "ocplib-json-typed" {>= "0.7"}
   "ocplib-json-typed-browser" {>= "0.7"}
@@ -58,7 +59,7 @@ depends: [
   "ppx_tools"
   "ppx_tools_versioned"
   "re"
-  "ssl" {= "0.5.5"}
+  "ssl" {= "0.5.10"}
   "uutf" {>= "1.0" }
   "vg"
   "yojson" {>= "1.4.0" }

diff --git a/learn-ocaml.opam.locked b/learn-ocaml.opam.locked
@@ -55,7 +55,7 @@ depends: [
   "fpath" {= "0.7.3"}
   "gg" {= "0.9.3"}
   "hex" {= "1.4.0"}
-  "ipaddr" {= "2.8.0"}
+  "ipaddr" {= "2.9.0"}
   "jbuilder" {= "1.0+beta20.2"}
   "js_of_ocaml" {= "3.9.0"}
   "js_of_ocaml-compiler" {= "3.9.1"}
@@ -107,7 +107,7 @@ depends: [
   "seq" {= "0.2.2"}
   "sexplib" {= "v0.14.0"}
   "sexplib0" {= "v0.14.0"}
-  "ssl" {= "0.5.5"}
+  "ssl" {= "0.5.10"}
   "stdlib-shims" {= "0.3.0"}
   "stringext" {= "1.6.0"}
   "topkg" {= "1.0.3"}

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_threads_stubs ssl crypto cstruct_stubs bigstringaf_stubs lwt_unix_stubs unix c"
+                COMMON_LIBS="camlstr ssl_stubs ssl crypto cstruct_stubs bigstringaf_stubs lwt_unix_stubs unix 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_threads_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="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"
         # `m` and `pthread` are built-in in libSystem
         echo2 '(-noautolink'
         for l in $EXTRA_LIBS $COMMON_LIBS; do