Merge pull request #4 from mseri/fix-build-on-macos

Fix build on macos

Author: bobot

antic/antic/dune

@@ -32,8 +32,8 @@
        CFLAGS=-fPIC)
       (run make library -j)
       (run make install)
-      (system "if [ -f ../prefix/lib/libantic.dylib ]; then mv ../prefix/lib/libantic.dylib ../prefix/lib/libantic.so; fi")
-      ))
+      (system
+       "if [ -f ../prefix/lib/libantic.dylib ]; then mv ../prefix/lib/libantic.dylib ../prefix/lib/libantic.so; fi")))
     (copy prefix/lib/libantic%{ext_dll} dllantic%{ext_dll})
     (copy prefix/lib/libantic%{ext_lib} libantic%{ext_lib})
     (copy prefix/include/antic/nf_elem.h nf_elem.h)

arb/dune

@@ -5,7 +5,10 @@
  (foreign_archives arb)
  (foreign_stubs
   (language c)
-  (names ocaml_acb_utils))
+  (names ocaml_acb_utils)
+  (flags
+   (:include ../configure/c_flags.sexp)
+   :standard))
  (libraries zarith flint threads)
  (flags -w -9-27)
  (ctypes
@@ -18,7 +21,9 @@
      "-Werror=implicit-function-declaration"
      (:include ../configure/c_flags.sexp)
      :standard)
-    (c_library_flags "-lgmp -lmpfr")))
+    (c_library_flags
+     (:include ../configure/libs.sexp)
+     "-lgmp -lmpfr")))
   (deps arb.h acb.h)
   (headers
    (include "acb.h" "string.h"))
@@ -101,8 +106,8 @@
        CFLAGS=-fPIC)
       (run make library -j)
       (run make install)
-      (system "if [ -f ../prefix/lib/libarb.dylib ]; then mv ../prefix/lib/libarb.dylib ../prefix/lib/libarb.so; fi")
-      ))
+      (system
+       "if [ -f ../prefix/lib/libarb.dylib ]; then mv ../prefix/lib/libarb.dylib ../prefix/lib/libarb.so; fi")))
     (copy prefix/lib/libarb%{ext_dll} dllarb%{ext_dll})
     (copy prefix/lib/libarb%{ext_lib} libarb%{ext_lib})
     (copy prefix/include/dirichlet.h dirichlet.h)

calcium/dune

@@ -6,6 +6,9 @@
  (foreign_stubs
   (language c)
   (names ocaml_calcium_utils)
+  (flags
+   (:include ../configure/c_flags.sexp)
+   :standard)
   (include_dirs
    lib
    (lib flint)
@@ -25,7 +28,9 @@
      "-Werror=implicit-function-declaration"
      (:include ../configure/c_flags.sexp)
      :standard)
-    (c_library_flags "-lgmp -lmpfr")))
+    (c_library_flags
+     (:include ../configure/libs.sexp)
+     "-lgmp -lmpfr")))
   (deps lib/ca.h)
   (headers
    (include "lib/ca.h" "string.h"))

calcium/lib/dune

@@ -66,8 +66,8 @@
        CFLAGS=-fPIC)
       (run make library -j)
       (run make install)
-      (system "if [ -f ../prefix/lib/libcalcium.dylib ]; then mv ../prefix/lib/libcalcium.dylib ../prefix/lib/libcalcium.so; fi")
-      ))
+      (system
+       "if [ -f ../prefix/lib/libcalcium.dylib ]; then mv ../prefix/lib/libcalcium.dylib ../prefix/lib/libcalcium.so; fi")))
     (copy prefix/lib/libcalcium%{ext_dll} dllcalcium%{ext_dll})
     (copy prefix/lib/libcalcium%{ext_lib} libcalcium%{ext_lib})
     (copy prefix/include/calcium/qqbar.h qqbar.h)

calcium/tests/dune

@@ -2,8 +2,7 @@
  (names units)
  (modules units)
  (libraries calcium)
- (package calcium)
-)
+ (package calcium))
 
 ;; Need dune whole mode for foreign library
 

configure/discover.ml

@@ -2,19 +2,20 @@ module C = Configurator.V1
 
 let () =
   C.main ~name:"discover" (fun c ->
-      let conf =
+      let cflags, libs =
         match C.Pkg_config.get c with
-        | None -> []
+        | None -> ([], [])
         | Some pc ->
-            let cflags ~package =
+            let flags ~package =
               match C.Pkg_config.query pc ~package with
-              | None -> []
-              | Some info -> info.cflags
+              | None -> ([], [])
+              | Some info -> (info.cflags, info.libs)
             in
-            let gmp = cflags ~package:"gmp" in
-            let mpfr = cflags ~package:"mpfr" in
+            let gmp = flags ~package:"gmp" in
+            let mpfr = flags ~package:"mpfr" in
 
-            gmp @ mpfr
+            (fst gmp @ fst mpfr, snd gmp @ snd mpfr)
       in
 
-      C.Flags.write_sexp "c_flags.sexp" conf)
+      C.Flags.write_sexp "c_flags.sexp" cflags;
+      C.Flags.write_sexp "libs.sexp" libs)

configure/dune

@@ -3,5 +3,6 @@
  (libraries dune-configurator))
 
 (rule
- (targets c_flags.sexp)
- (action (run ./discover.exe)))
+ (targets c_flags.sexp libs.sexp)
+ (action
+  (run ./discover.exe)))

flint/dune

@@ -6,6 +6,9 @@
  (foreign_stubs
   (language c)
   (names ocaml_flint_utils)
+  (flags
+   (:include ../configure/c_flags.sexp)
+   :standard)
   (include_dirs
    flint
    (lib zarith)))
@@ -21,7 +24,9 @@
      "-Werror=implicit-function-declaration"
      (:include ../configure/c_flags.sexp)
      :standard)
-    (c_library_flags "-lgmp -lmpfr")))
+    (c_library_flags
+     (:include ../configure/libs.sexp)
+     "-lgmp -lmpfr")))
   (deps flint/flint.h flint/fmpz.h)
   (headers
    (include "flint/fmpz.h" "flint/fmpq.h" "string.h"))

flint/flint/dune

@@ -140,8 +140,8 @@
       (run ./configure --prefix=../prefix CFLAGS=-fPIC --with-pkg-config)
       (run make library -j)
       (run make install)
-      (system "if [ -f ../prefix/lib/libflint.dylib ]; then mv ../prefix/lib/libflint.dylib ../prefix/lib/libflint.so; fi")
-      ))
+      (system
+       "if [ -f ../prefix/lib/libflint.dylib ]; then mv ../prefix/lib/libflint.dylib ../prefix/lib/libflint.so; fi")))
     (copy prefix/lib/libflint%{ext_lib} libflint%{ext_lib})
     (copy prefix/lib/libflint%{ext_dll} dllflint%{ext_dll})
     (copy prefix/include/flint/aprcl.h aprcl.h)

flint/tests/dune

@@ -9,6 +9,6 @@
  (names dynamic)
  (modules dynamic)
  (libraries dune-site.plugins zarith threads)
- (deps (package flint))
- (package flint)
-)
+ (deps
+  (package flint))
+ (package flint))