From: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
To: "xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>
Subject: Re: [PATCH] Fix the build of the ocaml libraries
Date: Wed, 5 Dec 2012 12:22:31 +0000 [thread overview]
Message-ID: <50BF3C87.5090201@eu.citrix.com> (raw)
In-Reply-To: <575e649ad4dc61a37118.1354710064@fungus>
This is a problem that affects xen-4.2.0, so it may well be worth
backporting.
Jon
On 05/12/12 12:21, Jon Ludlam wrote:
> These were previously capturing the absolute path of the build, causing
> linking against the libraries to fail unless you still have the build
> directory around.
>
> Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
>
> diff -r 29247e44df47 -r 575e649ad4dc tools/ocaml/Makefile.rules
> --- a/tools/ocaml/Makefile.rules
> +++ b/tools/ocaml/Makefile.rules
> @@ -58,14 +58,8 @@
>
> # define a library target <name>.cmxa and <name>.cma
> define OCAML_LIBRARY_template
> - $(1).cmxa: lib$(1)_stubs.a $(foreach obj,$($(1)_OBJS),$(obj).cmx)
> - $(call mk-caml-lib-native,$$@, -cclib -l$(1)_stubs $(foreach lib,$(LIBS_$(1)),-cclib $(lib)), $(foreach obj,$($(1)_OBJS),$(obj).cmx))
> - $(1).cma: $(foreach obj,$($(1)_OBJS),$(obj).cmo)
> - $(call mk-caml-lib-bytecode,$$@, -dllib dll$(1)_stubs.so -cclib -l$(1)_stubs, $$+)
> - $(1)_stubs.a: $(foreach obj,$$($(1)_C_OBJS),$(obj).o)
> - $(call mk-caml-stubs,$$@, $$+)
> - lib$(1)_stubs.a: $(foreach obj,$($(1)_C_OBJS),$(obj).o)
> - $(call mk-caml-lib-stubs,$$@, $$+)
> + $(1).cma: $(foreach obj,$($(1)_OBJS),$(obj).cmx $(obj).cmo) $(foreach obj,$($(1)_C_OBJS),$(obj).o)
> + $(OCAMLMKLIB) -o $1 -oc $(1)_stubs $(foreach obj,$($(1)_OBJS),$(obj).cmx $(obj).cmo) $(foreach obj,$($(1)_C_OBJS),$(obj).o) $(foreach lib, $(LIBS_$(1)_SYSTEM), -cclib $(lib)) $(foreach arg,$(LIBS_$(1)),-ldopt $(arg))
> endef
>
> define OCAML_NOC_LIBRARY_template
> diff -r 29247e44df47 -r 575e649ad4dc tools/ocaml/libs/eventchn/Makefile
> --- a/tools/ocaml/libs/eventchn/Makefile
> +++ b/tools/ocaml/libs/eventchn/Makefile
> @@ -9,6 +9,7 @@
> LIBS = xeneventchn.cma xeneventchn.cmxa
>
> LIBS_xeneventchn = $(LDLIBS_libxenctrl)
> +LIBS_xeneventchn_SYSTEM = -lxenctrl
>
> all: $(INTF) $(LIBS) $(PROGRAMS)
>
> diff -r 29247e44df47 -r 575e649ad4dc tools/ocaml/libs/xc/Makefile
> --- a/tools/ocaml/libs/xc/Makefile
> +++ b/tools/ocaml/libs/xc/Makefile
> @@ -10,6 +10,7 @@
> LIBS = xenctrl.cma xenctrl.cmxa
>
> LIBS_xenctrl = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest)
> +LIBS_xenctrl_SYSTEM = -lxenctrl -lxenguest
>
> xenctrl_OBJS = $(OBJS)
> xenctrl_C_OBJS = xenctrl_stubs
> diff -r 29247e44df47 -r 575e649ad4dc tools/ocaml/xenstored/Makefile
> --- a/tools/ocaml/xenstored/Makefile
> +++ b/tools/ocaml/xenstored/Makefile
> @@ -36,7 +36,9 @@
> -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/eventchn $(OCAML_TOPLEVEL)/libs/eventchn/xeneventchn.cmxa \
> -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xc $(OCAML_TOPLEVEL)/libs/xc/xenctrl.cmxa \
> -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xb $(OCAML_TOPLEVEL)/libs/xb/xenbus.cmxa \
> - -ccopt -L -ccopt $(XEN_ROOT)/tools/libxc
> + -ccopt -L -ccopt $(XEN_ROOT)/tools/libxc \
> + $(foreach obj, $(LDLIBS_libxenctrl), -ccopt $(obj)) \
> + $(foreach obj, $(LDLIBS_libxenguest), -ccopt $(obj))
>
> PROGRAMS = oxenstored
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2012-12-05 12:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-05 12:21 [PATCH] Fix the build of the ocaml libraries Jon Ludlam
2012-12-05 12:22 ` Jon Ludlam [this message]
2012-12-05 12:52 ` Ian Campbell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50BF3C87.5090201@eu.citrix.com \
--to=jonathan.ludlam@eu.citrix.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.