Skip to content

Get rid of calls to opam when using opam #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kit-ty-kate wants to merge 3 commits into from
Closed

Get rid of calls to opam when using opam #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29c7bbb
Mark ocaml-freestanding as compatible with OCaml 4.11
kit-ty-kate Jun 11, 2020
494b453
Get rid of calls to opam when using opam
kit-ty-kate Jun 11, 2020
057b58a
opam: Remove unnecessary field
kit-ty-kate Jun 11, 2020
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 Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ flags/libs.tmp: flags/libs.tmp.in
opam config subst $@

flags/libs: flags/libs.tmp Makeconf
env PKG_CONFIG_PATH="$(shell opam config var prefix)/lib/pkgconfig" \
env PKG_CONFIG_PATH="$(PREFIX)/lib/pkgconfig" \
pkg-config $(PKG_CONFIG_DEPS) --libs >> $<
awk -v RS= -- '{ \
sub("@@PKG_CONFIG_EXTRA_LIBS@@", "$(PKG_CONFIG_EXTRA_LIBS)", $$0); \
Expand All @@ -84,7 +84,7 @@ flags/cflags.tmp: flags/cflags.tmp.in
opam config subst $@

flags/cflags: flags/cflags.tmp Makeconf
env PKG_CONFIG_PATH="$(shell opam config var prefix)/lib/pkgconfig" \
env PKG_CONFIG_PATH="$(PREFIX)/lib/pkgconfig" \
pkg-config $(PKG_CONFIG_DEPS) --cflags >> $<
awk -v RS= -- '{ \
print "(", $$0, ")" \
Expand Down
7 changes: 6 additions & 1 deletion configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#!/bin/sh

export PKG_CONFIG_PATH=$(opam config var prefix)/lib/pkgconfig
PREFIX=${1:-$PREFIX}
if [ "$PREFIX" = "" ]; then
PREFIX="$(opam config var prefix)"
fi

export PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
pkg_exists() {
pkg-config --exists "$@"
}
Expand Down
5 changes: 2 additions & 3 deletions opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@ bug-reports: "https://github.com/mirage/ocaml-freestanding/issues/"
license: "MIT"
tags: "org:mirage"
dev-repo: "git+https://github.com/mirage/ocaml-freestanding.git"
build: [make]
build: [make "PREFIX=%{prefix}%"]
install: [make "install" "PREFIX=%{prefix}%"]
remove: [make "uninstall" "PREFIX=%{prefix}%"]
depends: [
"conf-pkg-config"
"ocamlfind" {build}
"ocaml-src" {build}
("solo5-bindings-hvt" | "solo5-bindings-spt" | "solo5-bindings-virtio" | "solo5-bindings-muen" | "solo5-bindings-genode")
"ocaml" {>= "4.08.0" & < "4.11.0"}
"ocaml" {>= "4.08.0" & < "4.12.0"}
]
substs: [
"flags/cflags.tmp"
Expand Down