Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[xenlight]: add the necessary link options to allow the use of Xenlight.

This should be unnecessary -- "ocamlfind -package xenlight" should be enough.
Ultimately if we improve the package this patch could be reverted.

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
  • Loading branch information...
commit 43809f3ab080eee1198240e041361a51a167f46f 1 parent 4f355af
@djs55 djs55 authored
Showing with 8 additions and 4 deletions.
  1. +3 −2 ocaml/xapi/OMakefile
  2. +5 −2 ocaml/xenops/OMakefile
View
5 ocaml/xapi/OMakefile
@@ -11,15 +11,16 @@ UseCamlp4(rpc-light.idl, storage_interface)
CFLAGS += -std=gnu99 -Wall -Werror -I$(shell ocamlc -where)
+XENLIGHT_LINK_FLAGS= -cclib -lxlutil -cclib -luuid -cclib -lblktapctl -cclib -lutil -cclib -lxenlight -cclib -lxenstore
# Since the section didn't work, link against the xen libs for everything if we are building
# xen stuff at all.
# NB order of libraries is important: OMake cannot determine dependencies between libraries
# (the same holds for OCaml packages)
XEN_OCAML_LIBS = ../xenops/xenops ../auth/pam
XEN_OCAMLINCLUDES =
-XEN_OCAMLPACKS = xenctrl xenstore cpuid
+XEN_OCAMLPACKS = xenctrl xenstore cpuid xenlight
OCAML_CLIBS = $(XEN_OCAML_CLIBS) $(OCAML_CLIBS)
-OCAML_LINK_FLAGS = $(XEN_OCAML_LINK_FLAGS) $(OCAML_LINK_FLAGS)
+OCAML_LINK_FLAGS = $(XEN_OCAML_LINK_FLAGS) $(OCAML_LINK_FLAGS) $(XENLIGHT_LINK_FLAGS)
CFLAGS = $(XEN_CFLAGS) $(CFLAGS)
OCAMLINCLUDES = $(XEN_OCAMLINCLUDES) $(OCAMLINCLUDES)
# xc.cma depends on uuid.cma
View
7 ocaml/xenops/OMakefile
@@ -1,10 +1,13 @@
OCAMLINCLUDES = ../xapi ../util
OCAML_LIBS = ../util/stats
OCAML_CLIBS += $(XEN_OCAML_CLIBS)
-OCAML_LINK_FLAGS+= $(XEN_OCAML_LINK_FLAGS)
+# XXX: these should all be specified in the ocamlfind META file:
+XENLIGHT_LINK_FLAGS= -cclib -lxlutil -cclib -luuid -cclib -lblktapctl -cclib -lutil -cclib -lxenlight -cclib -lxenstore
+OCAML_LINK_FLAGS+= $(XEN_OCAML_LINK_FLAGS) $(XENLIGHT_LINK_FLAGS)
+
CFLAGS += $(XEN_CFLAGS)
-OCAMLPACKS = threads xenctrl xenstore stdext log cdrom netdev
+OCAMLPACKS = threads xenctrl xenstore stdext log cdrom netdev xenlight
OCAMLFLAGS += -thread
LIBFILES = table xenops_helpers xenbus_utils balloon xenguestHelper domain hotplug device io statdev xal netman memory watch device_common squeeze squeeze_xen squeezed_rpc squeezed_state squeezed_rpc device_number stubdom
Please sign in to comment.
Something went wrong with that request. Please try again.