[fix] build/myocamlbuild_prefix.ml and libbase/mliconv.c: Fix the bui…

…ld on FreeBSD with libiconv.

build/myocamlbuild_prefix.ml

@@ -549,9 +549,14 @@ let _ = dispatch begin function
         flag ["ocaml"; "native"; "link"; tag] (S[A"-ccopt";A("-L"^dir);A"-cclib";A("-l"^name)]);
       in
 
-      (* In the memory.c in FreeBSD part that uses kvm_getprocs() required link with -lkvm. *)
       if is_fbsd then
+        (* In the memory.c in FreeBSD part that uses kvm_getprocs() required
+           link with -lkvm. *)
         flag ["use_stubs"; "link"] (S[A "-cclib";A "-lkvm"]);
+        (* Build with converters/libiconv port, which it installs in the
+           /usr/local by default *)
+        flag ["iconv"; "compile"] (S[A"-I";A "/usr/local/include"]);
+        flag ["iconv"; "link"] (S[A"-ccopt";A "-L/usr/local/lib";A "-cclib";A "-liconv"]);
 
 (* -- Don't forget that the rest of the "mlstate build stdlib" is in --
    -- myocamlbuild_suffix.ml. The rest comes from the build_rules*.ml in each repo -- *)

libbase/mliconv.c

@@ -137,9 +137,9 @@ CAMLprim value mliconv_convert(value conv, value source)
 	CAMLparam2(conv, source);
 	CAMLlocal1(result);
 	struct mliconv_t *internal = mliconv_val(conv);
-/* #if !defined(__APPLE__) */
-/* 	const */
-/* #endif */
+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__))
+ 	const
+#endif
 	char *s = String_val(source);
 	size_t s_len = caml_string_length(source);
 	size_t d_len = s_len * 6;