Embed .so next to binaries and properly set their RPATH

src/oui_lib/makeself_backend.ml

@@ -183,13 +183,14 @@ let uninstall_script (ic : Installer_config.t) =
   @ notify_uninstall_complete
 
 let add_sos_to_bundle ~bundle_dir binary =
-  let sos = Ldd.get_sos OpamFilename.Op.(bundle_dir // binary) in
+  let binary = OpamFilename.Op.(bundle_dir // binary) in
+  let sos = Ldd.get_sos binary in
   match sos with
   | [] -> ()
   | _ ->
-    let lib_dir = OpamFilename.Op.(bundle_dir / "lib") in
-    OpamFilename.mkdir lib_dir;
-    List.iter (fun so -> OpamFilename.copy_in so lib_dir) sos
+    let dst_dir = OpamFilename.dirname binary in
+    List.iter (fun so -> OpamFilename.copy_in so dst_dir) sos;
+    System.call_unit Patchelf (Set_rpath {rpath = "$ORIGIN"; binary})
 
 let create_installer
     ~(installer_config : Installer_config.t) ~bundle_dir installer =

src/oui_lib/system.ml

@@ -56,6 +56,9 @@ type productbuild_args = {
   output : OpamFilename.t;
 }
 
+type patchelf_args =
+  | Set_rpath of {rpath: string; binary: OpamFilename.t}
+
 type _ command =
   | Which : string command
   | Cygcheck : string command
@@ -70,6 +73,7 @@ type _ command =
   | CodesignVerify : codesign_verify_args command
   | Pkgbuild : pkgbuild_args command
   | Productbuild : productbuild_args command
+  | Patchelf : patchelf_args command
 
 exception System_error of string
 
@@ -144,6 +148,8 @@ let call_inner : type a. a command -> a -> string * string list =
       "--package"; OpamFilename.to_string package;
       OpamFilename.to_string output
     ]
+  | Patchelf, (Set_rpath {rpath; binary}) ->
+    "patchelf", ["--set-rpath"; rpath; OpamFilename.to_string binary]
 
 let gen_command_tmp_dir cmd =
   Printf.sprintf "%s-%06x" (Filename.basename cmd) (Random.int 0xFFFFFF)

src/oui_lib/system.mli

@@ -74,6 +74,10 @@ type productbuild_args = {
   output : OpamFilename.t; (** Output .pkg file *)
 }
 
+(** Arguments for patchelf command *)
+type patchelf_args =
+  | Set_rpath of {rpath: string; binary: OpamFilename.t}
+
 (** External commands that could be called and handled by {b oui}. *)
 type _ command =
   | Which : string command  (** {b which} command, to check programs availability *)
@@ -89,6 +93,7 @@ type _ command =
   | CodesignVerify : codesign_verify_args command (** {b codesign --verify} command to verify code signatures *)
   | Pkgbuild : pkgbuild_args command (** {b pkgbuild} command to create macOS component packages *)
   | Productbuild : productbuild_args command (** {b productbuild} command to create macOS installer packages *)
+  | Patchelf : patchelf_args command
 
 (** Calls given command with its arguments and parses output, line by line. Raises [System_error]
     with command's output when command exits with non-zero exit status. *)