full compat pkg-config

mirage · Sep 27, 2021 · d2e8965 · d2e8965
1 parent 20350d5
commit d2e8965
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -116,6 +116,7 @@ ocaml-freestanding.pc: ocaml-freestanding.pc.in Makeconf
 	sed -e 's!@@PKG_CONFIG_EXTRA_LIBS@@!$(MAKECONF_PKG_CONFIG_EXTRA_LIBS)!' \
 	    -e 's!@@PKG_CONFIG_CC@@!$(MAKECONF_CC)!' \
 	    -e 's!@@PKG_CONFIG_LD@@!$(MAKECONF_LD)!' \
+		-e 's!@@PKG_CONFIG_SOLO5_TOOLCHAIN@@!$(MAKECONF_TOOLCHAIN)!' \
 	    -e 's!@@CFLAGS@@!$(MAKECONF_CFLAGS)!' \
 	    ocaml-freestanding.pc.in > $@
 

diff --git a/configure.sh b/configure.sh
@@ -92,6 +92,7 @@ fi
 cat <<EOM >Makeconf
 MAKECONF_PREFIX=${MAKECONF_PREFIX}
 MAKECONF_CFLAGS=${MAKECONF_CFLAGS}
+MAKECONF_TOOLCHAIN=${CONFIG_TARGET}
 MAKECONF_CC=${MAKECONF_CC}
 MAKECONF_LD=${MAKECONF_LD}
 MAKECONF_AS=${MAKECONF_AS}

diff --git a/ocaml-freestanding.opam b/ocaml-freestanding.opam
@@ -12,7 +12,7 @@ build: [
    "--target=x86_64-solo5-none-static" { arch = "x86_64"}
    "--target=aarch64-solo5-none-static" { arch = "arm64"}
   ]
-  [make]
+  [make "-j%{jobs}%"]
 ]
 install: [make "install" ]
 depends: [
@@ -23,7 +23,7 @@ depends: [
   "solo5" {>= "0.7.0"}
 ]
 pin-depends: [
-  ["solo5.0.7.0" "git+https://github.com/mato/solo5#new-toolchain"]
+  ["solo5.0.7.0" "git+https://github.com/TheLortex/solo5#new-toolchain+pkgconfig"]
 ]
 conflicts: [
   "sexplib" {= "v0.9.0"}

diff --git a/ocaml-freestanding.pc.in b/ocaml-freestanding.pc.in
@@ -10,3 +10,4 @@ URL: https://github.com/mirage/ocaml-freestanding/
 Description: Freestanding OCaml runtime
 Cflags: -I${libdir} -I${sysroot}/include/nolibc -include _freestanding/overrides.h
 Libs: -L${libdir} -lasmrun -L${sysroot}/lib/nolibc -lnolibc -lopenlibm @@PKG_CONFIG_EXTRA_LIBS@@
+Requires: @@PKG_CONFIG_SOLO5_TOOLCHAIN@@