Skip to content

Commit

Permalink
[configure] Use --with-pkg-config
Browse files Browse the repository at this point in the history
            Help for Nix and brew installation
  • Loading branch information
bobot committed Feb 11, 2023
1 parent b72811b commit fb63663
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 13 deletions.
8 changes: 4 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[submodule "arb"]
path = arb/arb
url = https://github.com/fredrik-johansson/arb.git
url = https://github.com/bobot/arb.git
[submodule "flint2"]
path = flint/flint/flint2
url = https://github.com/wbhart/flint2.git
url = https://github.com/bobot/flint2.git
[submodule "antic"]
path = antic/antic/antic
url = https://github.com/wbhart/antic.git
url = https://github.com/bobot/antic.git
[submodule "calcium"]
path = calcium/lib/calcium
url = https://github.com/fredrik-johansson/calcium.git
url = https://github.com/bobot/calcium.git
1 change: 1 addition & 0 deletions antic.opam
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ depends: [
"ctypes" {>= "0.20.1"}
"conf-mpfr" {>= "3"}
"ocaml" {>= "4.10"}
"conf-pkg-config" {>= "2"}
"odoc" {with-doc}
]
build: [
Expand Down
2 changes: 1 addition & 1 deletion antic/antic/antic
Submodule antic updated 1 files
+17 −3 configure
1 change: 1 addition & 0 deletions antic/antic/dune
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
./configure
--with-flint=%{read:flint_dir}
--prefix=../prefix
--with-pkg-config
CFLAGS=-fPIC)
(run make library -j)
(run make install)))
Expand Down
1 change: 1 addition & 0 deletions arb.opam
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ depends: [
"ctypes" {>= "0.20.1"}
"conf-mpfr" {>= "3"}
"ocaml" {>= "4.10"}
"conf-pkg-config" {>= "2"}
"odoc" {with-doc}
]
build: [
Expand Down
2 changes: 1 addition & 1 deletion arb/arb
Submodule arb updated 1 files
+21 −4 configure
1 change: 1 addition & 0 deletions arb/dune
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
./configure
--with-flint=%{read:flint_dir}
--prefix=../prefix
--with-pkg-config
CFLAGS=-fPIC)
(run make library -j)
(run make install)))
Expand Down
1 change: 1 addition & 0 deletions calcium.opam
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ depends: [
"conf-mpfr" {>= "3"}
"dune-site" {with-test}
"ocaml" {>= "4.10"}
"conf-pkg-config" {>= "2"}
"odoc" {with-doc}
]
build: [
Expand Down
2 changes: 1 addition & 1 deletion calcium/lib/calcium
Submodule calcium updated 1 files
+13 −2 configure
1 change: 1 addition & 0 deletions calcium/lib/dune
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
--with-arb=%{read:arb_dir}
--with-antic=%{read:antic_dir}
--prefix=../prefix
--with-pkg-config
CFLAGS=-fPIC)
(run make library -j)
(run make install)))
Expand Down
8 changes: 4 additions & 4 deletions dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,25 @@
(package
(name flint)
(synopsis "Stub of the C library Flint2")
(depends (zarith (>= 1.12)) (ctypes (>= 0.20.1)) (conf-mpfr (>= 3)) (dune-site :with-test) (ocaml (>= 4.10)))
(depends (zarith (>= 1.12)) (ctypes (>= 0.20.1)) (conf-mpfr (>= 3)) (dune-site :with-test) (ocaml (>= 4.10)) (conf-pkg-config (>= 2)))
)

(package
(name arb)
(synopsis "Stub of the C library Arb. Ball approximation")
(depends flint (ctypes (>= 0.20.1)) (conf-mpfr (>= 3)) (ocaml (>= 4.10)))
(depends flint (ctypes (>= 0.20.1)) (conf-mpfr (>= 3)) (ocaml (>= 4.10)) (conf-pkg-config (>= 2)))
)


(package
(name antic)
(synopsis "Stub of the C library Antic. Algebraic number")
(depends flint (ctypes (>= 0.20.1)) (conf-mpfr (>= 3)) (ocaml (>= 4.10)))
(depends flint (ctypes (>= 0.20.1)) (conf-mpfr (>= 3)) (ocaml (>= 4.10)) (conf-pkg-config (>= 2)))
)

(package
(name calcium)
(synopsis "Stub of the C library Antic. For exact computation \
with real and complex numbers, presently in early development")
(depends (zarith (>= 1.12)) flint arb antic (ctypes (>= 0.20.1)) (conf-mpfr (>= 3)) (dune-site :with-test) (ocaml (>= 4.10)))
(depends (zarith (>= 1.12)) flint arb antic (ctypes (>= 0.20.1)) (conf-mpfr (>= 3)) (dune-site :with-test) (ocaml (>= 4.10)) (conf-pkg-config (>= 2)))
)
1 change: 1 addition & 0 deletions flint.opam
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ depends: [
"conf-mpfr" {>= "3"}
"dune-site" {with-test}
"ocaml" {>= "4.10"}
"conf-pkg-config" {>= "2"}
"odoc" {with-doc}
]
build: [
Expand Down
2 changes: 1 addition & 1 deletion flint/flint/dune
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
(chdir
flint2
(progn
(run ./configure --prefix=../prefix CFLAGS=-fPIC)
(run ./configure --prefix=../prefix CFLAGS=-fPIC --with-pkg-config)
(run make library -j)
(run make install)))
(copy prefix/lib/libflint.a libflint.a)
Expand Down
2 changes: 1 addition & 1 deletion flint/flint/flint2
Submodule flint2 updated 1 files
+21 −4 configure

0 comments on commit fb63663

Please sign in to comment.