Clean up declared library dependencies and META

This fixes the issue with latest dose and Debian module linking (but dose's META might be worth looking into). cc @abate.
garybyrd · Aug 19, 2015 · bf04935 · bf04935
1 parent 2200995
commit bf04935
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 20 deletions.
diff --git a/META.in b/META.in
@@ -22,19 +22,19 @@ package "solver" (
   version = "@PACKAGE_VERSION@"
   archive(byte) = "opam-solver.cma"
   archive(native) = "opam-solver.cmxa"
-  requires = "cudf, dose3, opam-lib, opam-lib.format"
+  requires = "cudf, dose3.common, dose3.algo, opam-lib, opam-lib.format"
 )
 
 package "state" (
   version = "@PACKAGE_VERSION@"
   archive(byte) = "opam-state.cma"
   archive(native) = "opam-state.cmxa"
-  requires = "re.glob, opam-lib, opam-lib.format, opam-lib.solver, opam-lib.repository, cmdliner"
+  requires = "opam-lib, opam-lib.format, opam-lib.solver, opam-lib.repository"
 )
 
 package "client" (
   version = "@PACKAGE_VERSION@"
   archive(byte) = "opam-client.cma"
   archive(native) = "opam-client.cmxa"
-  requires = "cmdliner, opam-lib, opam-lib.format, opam-lib.solver, opam-lib.repository, opam-lib.state"
+  requires = "cmdliner, re.glob, opam-lib, opam-lib.format, opam-lib.solver, opam-lib.repository, opam-lib.state"
 )
diff --git a/Makefile.config.in b/Makefile.config.in
@@ -9,7 +9,7 @@ version = @PACKAGE_VERSION@
 FETCH = @fetch@
 HAS_PACKAGES = @hasalldeps@
 USE_BYTE := $(if $(subst no,,@OCAMLOPT@),,true)
-PACKS = @OCAML_PKG_unix@ @OCAML_PKG_extlib@ @OCAML_PKG_re@ @OCAML_PKG_re_emacs@ @OCAML_PKG_re_str@ @OCAML_PKG_re_perl@ @OCAML_PKG_re_pcre@ @OCAML_PKG_re_glob@ @OCAML_PKG_cmdliner@ @OCAML_PKG_ocamlgraph@ @OCAML_PKG_cudf@ @OCAML_PKG_dose3@ @OCAML_PKG_jsonm@
+PACKS = @OCAML_PKG_unix@ @OCAML_PKG_extlib@ @OCAML_PKG_re@ @OCAML_PKG_re_emacs@ @OCAML_PKG_re_str@ @OCAML_PKG_re_perl@ @OCAML_PKG_re_pcre@ @OCAML_PKG_re_glob@ @OCAML_PKG_cmdliner@ @OCAML_PKG_ocamlgraph@ @OCAML_PKG_cudf@ @OCAML_PKG_dose3_common@ @OCAML_PKG_dose3_algo@ @OCAML_PKG_jsonm@
 
 OCAMLFIND = @OCAMLFIND@
 OCAML = @OCAML@

diff --git a/configure b/configure
@@ -587,7 +587,8 @@ ac_subst_vars='LTLIBOBJS
 LIBOBJS
 hasalldeps
 OCAML_PKG_jsonm
-OCAML_PKG_dose3
+OCAML_PKG_dose3_algo
+OCAML_PKG_dose3_common
 OCAML_PKG_cudf
 OCAML_PKG_ocamlgraph
 OCAML_PKG_cmdliner
@@ -4490,25 +4491,49 @@ $as_echo "not found" >&6; }
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCaml findlib package dose3" >&5
-$as_echo_n "checking for OCaml findlib package dose3... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCaml findlib package dose3.common" >&5
+$as_echo_n "checking for OCaml findlib package dose3.common... " >&6; }
 
   unset found
   unset pkg
   found=no
-  for pkg in dose3 dose ; do
+  for pkg in dose3.common dose.common ; do
     if $OCAMLFIND query $pkg >/dev/null 2>/dev/null; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
 $as_echo "found" >&6; }
-      OCAML_PKG_dose3=$pkg
+      OCAML_PKG_dose3_common=$pkg
       found=yes
       break
     fi
   done
   if test "$found" = "no" ; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 $as_echo "not found" >&6; }
-    OCAML_PKG_dose3=no
+    OCAML_PKG_dose3_common=no
+  fi
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCaml findlib package dose3.algo" >&5
+$as_echo_n "checking for OCaml findlib package dose3.algo... " >&6; }
+
+  unset found
+  unset pkg
+  found=no
+  for pkg in dose3.algo dose.algo ; do
+    if $OCAMLFIND query $pkg >/dev/null 2>/dev/null; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
+      OCAML_PKG_dose3_algo=$pkg
+      found=yes
+      break
+    fi
+  done
+  if test "$found" = "no" ; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+    OCAML_PKG_dose3_algo=no
   fi
 
 

diff --git a/configure.ac b/configure.ac
@@ -65,7 +65,8 @@ AC_CHECK_OCAML_PKG([re.glob])
 AC_CHECK_OCAML_PKG([cmdliner])
 AC_CHECK_OCAML_PKG([ocamlgraph])
 AC_CHECK_OCAML_PKG([cudf])
-AC_CHECK_OCAML_PKG(dose3,dose)
+AC_CHECK_OCAML_PKG(dose3.common,dose.common)
+AC_CHECK_OCAML_PKG(dose3.algo,dose.algo)
 AC_CHECK_OCAML_PKG([jsonm])
 
 dnl echo

diff --git a/src/Makefile b/src/Makefile
@@ -43,7 +43,7 @@ endif
 
 ifneq ($(HAS_LIBEXT),)
   EXT_INCDIRS = ../src_ext/lib
-  LIBS = unix extlib re cmdliner graph cudf dose_common dose_debian dose_algo uutf jsonm
+  LIBS = unix extlib re cmdliner graph cudf dose_common dose_algo uutf jsonm
 else
   ifeq ($(HAS_PACKAGES),)
     $(error Dependencies missing. Either run 'make lib-ext' or install them and re-run './configure')

diff --git a/src/client/client.ocp b/src/client/client.ocp
@@ -14,10 +14,8 @@ begin library "opam-client"
   ]
 
   requires = [
-    "opam-core"
-    "opam-solver"
-    "opam-repository"
     "opam-state"
+    "re.glob"
     "cmdliner"
   ]
 

diff --git a/src/format/format.ocp b/src/format/format.ocp
@@ -20,9 +20,7 @@ begin library "opam-format"
 
   requires = [
     "opam-core"
-    "unix"
-    "re.glob"
-    "re.str"
+    "re.pcre"
   ]
 
 end
diff --git a/src/solver/solver.ocp b/src/solver/solver.ocp
@@ -9,7 +9,6 @@ begin library "opam-solver"
   ]
 
   requires = [
-    "dose3"
     "dose3.common"
     "dose3.algo"
     "opam-core"

diff --git a/src/state/state.ocp b/src/state/state.ocp
@@ -16,7 +16,6 @@ begin library "opam-state"
     "opam-core"
     "opam-solver"
     "opam-repository"
-    "cmdliner"
   ]
 
 end