[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH v1 1/1] ocaml/libs: Remove xsd_glue_dev package, also install plugin_interface_v1.a



xsd_glue_dev packaging is inconsistent with the rest of OCaml packages
and isn't actually necessary. .a is needed alongside compiled bytecode
files during linking and was missed in the initial oxenstore plugin
work.

Specify OCAMLCFLAGS along with OCAMLOPTFLAGS.

Signed-off-by: Andrii Sultanov <andrii.sultanov@xxxxxxxxx>
---
 tools/ocaml/libs/xsd_glue/Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/ocaml/libs/xsd_glue/Makefile 
b/tools/ocaml/libs/xsd_glue/Makefile
index f84291f7fe..be68642968 100644
--- a/tools/ocaml/libs/xsd_glue/Makefile
+++ b/tools/ocaml/libs/xsd_glue/Makefile
@@ -5,6 +5,7 @@ include $(OCAML_TOPLEVEL)/common.make
 SUBDIRS= domain_getinfo_plugin_v1
 
 CFLAGS += $(CFLAGS_xeninclude)
+OCAMLCFLAGS += -opaque
 OCAMLOPTFLAGS += -opaque
 
 OBJS = plugin_interface_v1
@@ -28,14 +29,11 @@ OCAML_NOC_LIBRARY = plugin_interface_v1
 install: $(LIBS) META subdirs-install
        mkdir -p $(OCAMLDESTDIR)
        $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xsd_glue
-       $(OCAMLFIND) install -destdir $(OCAMLDESTDIR) -ldconf ignore xsd_glue 
META $(INTF) $(LIBS)
-       $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xsd_glue_dev
-       $(OCAMLFIND) install -destdir $(OCAMLDESTDIR) -ldconf ignore 
xsd_glue_dev META $(INTF) $(LIBS) *.ml *.mli
+       $(OCAMLFIND) install -destdir $(OCAMLDESTDIR) -ldconf ignore xsd_glue 
META $(INTF) $(LIBS) *.a
 
 .PHONY: uninstall
 uninstall: subdirs-uninstall
        $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xsd_glue
-       $(OCAMLFIND) remove -destdir $(OCAMLDESTDIR) xsd_glue_dev
 
 .PHONY: clean
 clean: subdirs-clean
-- 
2.39.5




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.