Skip to content
This repository has been archived by the owner on Oct 18, 2020. It is now read-only.

Fix flags generation. #210

Merged
merged 1 commit into from
May 30, 2019
Merged

Fix flags generation. #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions xen-ocaml/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,5 +144,5 @@ 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
echo "($(cat flags/libs.tmp) -cclib \"$(pkg-config libminios-xen openlibm --libs | xargs)\")" > flags/libs
echo "($(pkg-config libminios-xen openlibm --cflags | xargs) $(cat flags/cflags.tmp))" > flags/cflags
2 changes: 1 addition & 1 deletion xen-ocaml/flags/libs.tmp.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
%{mirage-xen-ocaml:lib}%/libxenasmrun.a %{mirage-xen-ocaml:lib}%/libxenotherlibs.a %{mirage-xen-posix:lib}%/libxenposix.a
-I %{mirage-xen-ocaml:lib}% -cclib "%{mirage-xen-ocaml:lib}%/libasmrunxen.a %{mirage-xen-ocaml:lib}%/libxenotherlibs.a %{mirage-xen-posix:lib}%/libxenposix.a"
4 changes: 2 additions & 2 deletions xen-ocaml/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ if [ "$prefix" = "" ]; then
prefix=`opam config var prefix`
fi

OCAML_LIB_DIR=$(ocamlopt -config )
OCAMLOPT_VERSION=$(ocamlopt -version)
echo Detected OCaml version $OCAMLOPT_VERSION
case $OCAMLOPT_VERSION in
Expand All @@ -22,8 +23,7 @@ odir=$prefix/lib
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/$ASMRUN_FOLDER/libasmrun.a $odir/mirage-xen-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/
Expand Down
2 changes: 1 addition & 1 deletion xen-ocaml/mirage-xen-ocaml.pc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ Version: 1.0.0
URL: https://github.com/mirage/mirage-platform/
Description: OCaml runtime compiled for Mirage Xen
Cflags: -I${includedir}
Libs: ${libdir}/mirage-xen-ocaml/libxenasmrun.a ${libdir}/mirage-xen-ocaml/libxenotherlibs.a
Libs: ${libdir}/mirage-xen-ocaml/libasmrunxen.a ${libdir}/mirage-xen-ocaml/libxenotherlibs.a
Requires: mirage-xen-posix

3 changes: 2 additions & 1 deletion xen-ocaml/uninstall.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ if [ "$prefix" = "" ]; then
prefix=`opam config var prefix`
fi

OCAML_LIB_DIR=$(opam config var stublibs)
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
rm -f $OCAML_LIB_DIR/libasmrunxen.a
8 changes: 4 additions & 4 deletions xen-posix/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ 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
echo "(-cclib \"$(pkg-config libminios-xen openlibm --libs | xargs)\" $(cat flags/minios-libs.tmp))" > flags/minios-libs
echo "($(pkg-config libminios-xen openlibm --cflags | xargs) $(cat flags/minios-cflags.tmp))" > flags/minios-cflags
echo "(-cclib \"$(pkg-config libminios-xen openlibm --libs | xargs)\" $(cat flags/posix-libs.tmp))" > flags/posix-libs
echo "($(pkg-config libminios-xen openlibm --cflags | xargs) $(cat flags/posix-cflags.tmp))" > flags/posix-cflags
2 changes: 1 addition & 1 deletion xen-posix/flags/minios-libs.tmp.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
%{mirage-xen-posix:lib}%/libxenposix.a
-cclib %{mirage-xen-posix:lib}%/libxenposix.a
2 changes: 1 addition & 1 deletion xen-posix/flags/posix-libs.tmp.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
%{mirage-xen-posix:lib}%/libxenposix.a
-cclib %{mirage-xen-posix:lib}%/libxenposix.a