Merge pull request #207 from TheLortex/with-flags-files

Expose flags though files and enable the use of -runtime-variant

Author: avsm

mirage-xen-ocaml.opam

@@ -13,6 +13,10 @@ depends: [
   "ocaml-src"
   "ocamlbuild" {build}
 ]
+substs: [
+  "xen-ocaml/flags/cflags.tmp"
+  "xen-ocaml/flags/libs.tmp"
+  ]
 available: os = "linux"
 build: [make "xen-ocaml-build"]
 install: [make "xen-ocaml-install" "PREFIX=%{prefix}%"]

mirage-xen-posix.opam

@@ -9,6 +9,12 @@ depends: [
   "mirage-xen-minios" {>= "0.7.0"}
   "conf-pkg-config"
 ]
+substs: [
+  "xen-posix/flags/posix-cflags.tmp"
+  "xen-posix/flags/posix-libs.tmp"
+  "xen-posix/flags/minios-cflags.tmp"
+  "xen-posix/flags/minios-libs.tmp"
+  ]
 available: os = "linux"
 build: [make "xen-posix-build"]
 install: [make "xen-posix-install" "PREFIX=%{prefix}%"]

xen-ocaml/build.sh

@@ -141,3 +141,8 @@ esac
 CFLAGS="$CFLAGS -I../../byterun"
 cd otherlibs/bigarray && make CFLAGS="${CFLAGS} -I../unix -DIN_OCAML_BIGARRAY" ${BIGARRAY_OBJ}
 ar rcs ../../libxenotherlibs.a ${BIGARRAY_OBJ}
+
+cd ../../..
+
+echo "($(pkg-config libminios-xen --libs)$(pkg-config openlibm --libs)$(cat flags/libs.tmp))" > flags/libs
+echo "($(pkg-config libminios-xen --cflags)$(pkg-config openlibm --cflags)$(cat flags/cflags.tmp))" > flags/cflags

xen-ocaml/flags/cflags.tmp.in

@@ -0,0 +1 @@
+-I%{prefix}%/include/mirage-xen-ocaml/include -I%{prefix}%/include/mirage-xen-posix/include

xen-ocaml/flags/libs.tmp.in

@@ -0,0 +1 @@
+%{mirage-xen-ocaml:lib}%/libxenasmrun.a %{mirage-xen-ocaml:lib}%/libxenotherlibs.a %{mirage-xen-posix:lib}%/libxenposix.a

xen-ocaml/install.sh

@@ -23,7 +23,10 @@ mkdir -p $odir/mirage-xen-ocaml
 #We dont install the bytecode version yet
 #cd ocaml-src/byterun && make install LIBDIR="${pwd}/obj" BINDIR="${pwd}/obj"
 cp ocaml-src/$ASMRUN_FOLDER/libasmrun.a $odir/mirage-xen-ocaml/libxenasmrun.a
+ln -s $odir/mirage-xen-ocaml/libxenasmrun.a $odir/ocaml/libasmrunxen.a
 cp ocaml-src/libxenotherlibs.a $odir/mirage-xen-ocaml/libxenotherlibs.a
+cp flags/cflags $odir/mirage-xen-ocaml/
+cp flags/libs $odir/mirage-xen-ocaml/
 touch $odir/mirage-xen-ocaml/META
 mkdir -p $odir/pkgconfig
 cp mirage-xen-ocaml.pc $odir/pkgconfig/mirage-xen-ocaml.pc

xen-ocaml/uninstall.sh

@@ -9,3 +9,4 @@ odir=$prefix/lib
 rm -f $odir/pkgconfig/mirage-xen-ocaml.pc
 rm -rf $odir/mirage-xen-ocaml
 rm -rf $prefix/include/mirage-xen-ocaml
+rm -f $odir/ocaml/libasmrunxen.a

xen-posix/build.sh

@@ -37,3 +37,8 @@ CFLAGS="$EXTRA_CFLAGS ${CI_CFLAGS} -I ${PWD}/include/ -I ${PWD}/src/ \
 
 ${CC} -c ${CFLAGS} src/*.c
 ar rcs libxenposix.a mini_libc.o fmt_fp.o dtoa.o strtol.o
+
+echo "($(pkg-config libminios-xen --libs)$(pkg-config openlibm --libs)$(cat flags/minios-libs.tmp))" > flags/minios-libs
+echo "($(pkg-config libminios-xen --cflags)$(pkg-config openlibm --cflags)$(cat flags/minios-cflags.tmp))" > flags/minios-cflags
+echo "($(pkg-config libminios-xen --libs)$(pkg-config openlibm --libs)$(cat flags/posix-libs.tmp))" > flags/posix-libs
+echo "($(pkg-config libminios-xen --cflags)$(pkg-config openlibm --cflags)$(cat flags/posix-cflags.tmp))" > flags/posix-cflags

xen-posix/flags/minios-cflags.tmp.in

@@ -0,0 +1 @@
+-D__XEN_INTERFACE_VERSION__=0x00030205 -D__INSIDE_MINIOS__ -I%{prefix}%/include/mirage-xen-posix/include

xen-posix/flags/minios-libs.tmp.in

@@ -0,0 +1 @@
+%{mirage-xen-posix:lib}%/libxenposix.a