[Pkg-xen-devel] [PATCH 6/7] Create 2 ocaml packages, libxen-4.1-ocaml and libxen-4.1-ocaml-dev.

[Bastian Blank]

On Fri, Nov 18, 2011 at 04:28:35PM +0000, Jon Ludlam wrote:
> diff --git a/xen/debian/bin/gencontrol.py b/xen/debian/bin/gencontrol.py
> index f2b7424..2bdf5fb 100755
> --- a/xen/debian/bin/gencontrol.py
> +++ b/xen/debian/bin/gencontrol.py
> @@ -49,6 +49,11 @@ class Gencontrol(Base):
>              j = self.substitute(self.templates["xen-utils.%s" % i], vars)
>              file("debian/%s.%s" % (package_utils_name, i), 'w').write(j)
>  
> +	for (i,j) in (('libxen-ocaml.install','libxen-%s-ocaml.install' % self.version.xen_version), 
> +		      ('libxen-ocaml-dev.install','libxen-%s-ocaml-dev.install' % self.version.xen_version)):
> +	    k = self.substitute(self.templates[i], vars)
> +	    file("debian/%s" % j, 'w').write(k)
> +

No. Specify them in the rules file.

> --- /dev/null
> +++ b/xen/debian/patches/tools-ocaml-fix-build.diff
> @@ -0,0 +1,81 @@
> +Fix the build of the ocaml libraries 

Care to explain?

> +--- a/tools/ocaml/libs/xc/Makefile
> ++++ b/tools/ocaml/libs/xc/Makefile
> +@@ -9,7 +9,8 @@
> + INTF = xenctrl.cmi
> + LIBS = xenctrl.cma xenctrl.cmxa
> + 
> +-LIBS_xenctrl = -L$(XEN_ROOT)/tools/libxc -lxenctrl -lxenguest
> ++LIBS_xenctrl = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest)
> ++LIBS_xenctrl_SYSTEM = $(LDLIBS_libxenctrl_SYSTEM) $(LDLIBS_libxenguest_SYSTEM)

Why? Every linker have to support shared object files.

>  debian/control-real: $(CONTROL_FILES)
> -	debian/bin/gencontrol.py
> +	debian/bin/gencontrol.py $(OCAML_STDLIB_DIR) $(OCAML_DLL_DIR)

Nope. No arguments to gencontrol

> +Depends: ocaml-base-nox-${F:OCamlABI}

Why is this not generated?

> +Depends: ocaml-findlib (>= 1.1)

Same.

> + ocaml-nox (>= 3.11.1-3~),
> + dh-ocaml (>= 0.9~),

Why the versions? They are fullfiled in Squeeze.

> --- /dev/null
> +++ b/xen/debian/templates/libxen-ocaml-dev.install.in
> --- /dev/null
> +++ b/xen/debian/templates/libxen-ocaml.install.in

No. Use dh_install $(OCAML_STDLIB_DIR)/*/*.cmi …

Bastian

-- 
There are always alternatives.
		-- Spock, "The Galileo Seven", stardate 2822.3