| Message ID | c9b47337615168e38fb6af2a80409f0a38ead901.1728471268.git.andrii.sultanov@cloud.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Oxenstored packaging fixes | expand |
> On 9 Oct 2024, at 16:15, Andrii Sultanov <andrii.sultanov@cloud.com> wrote: > > 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@cloud.com> > --- > tools/ocaml/libs/xsd_glue/Makefile | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > Acked-by: Christian Lindig <christian.lindig@cloud.com>
On Wed, Oct 9, 2024 at 4:15 PM Andrii Sultanov <andrii.sultanov@cloud.com> wrote: > > xsd_glue_dev packaging is inconsistent with the rest of OCaml packages > and isn't actually necessary. .a is needed alongside compiled bytecode Being singular, should not be "The <NAME>.a is needed "... ? Or are there multiple archive files? > files during linking and was missed in the initial oxenstore plugin > work. > > Specify OCAMLCFLAGS along with OCAMLOPTFLAGS. > > Signed-off-by: Andrii Sultanov <andrii.sultanov@cloud.com> > --- > 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 Frediano
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
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@cloud.com> --- tools/ocaml/libs/xsd_glue/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)