Skip to content
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.

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

On Windows, run PKG_CONFIG_PATH through cygpath #150

Merged
merged 1 commit into from Mar 29, 2022

Conversation

MisterDA
Copy link
Contributor

@MisterDA MisterDA commented Feb 1, 2022

When using OCaml in Windows, PKG_CONFIG_PATH is usually in Windows
style. GNU Make with the shell function will call Cygwin's Unix shell
which doesn't recognize Windows paths. If we're on a Windows system,
and if we find cygpath, convert the path list to Unix style.

This is the same patch that I've pushed to mirage-tcpip and elsewhere.

@MisterDA
Copy link
Contributor Author

MisterDA commented Feb 1, 2022

ping @hannesm, @dinosaure

When using OCaml in Windows, PKG_CONFIG_PATH is usually in Windows
style. GNU Make with the shell function will call Cygwin's Unix shell
which doesn't recognize Windows paths. If we're on a Windows system,
and if we find cygpath, convert the path list to Unix style.
@hannesm
Copy link
Member

hannesm commented Feb 1, 2022

yes, this patch looks good. would it be fine with you to defer that until we've mirage4 out and can remove these Makefiles completely?

@MisterDA
Copy link
Contributor Author

MisterDA commented Feb 1, 2022 via email

@hannesm hannesm merged commit 20292d3 into mirage:main Mar 29, 2022
@hannesm
Copy link
Member

hannesm commented Mar 29, 2022

Thanks.

hannesm added a commit to hannesm/opam-repository that referenced this pull request Mar 29, 2022
…age, mirage-crypto-rng-async, mirage-crypto-pk and mirage-crypto-ec (0.10.6)

CHANGES:

- Use _WIN32 instead of __WIN32__, as proposed by @jonahbeckford in mirage/mirage-crypto#137
- PKG_CONFIG_PATH via cygpath on Window (mirage/mirage-crypto#150 @MisterDA)
- ocaml-solo5 (formerly ocaml-freestanding) defines __ocaml_solo5__, use this
  in ifdef (arm only, mirage/mirage-crypto#152 @hannesm)
- mirag-crypto-rng-mirage test: require mirage-unix >= 5.0.0 (mirage/mirage-crypto#151 @hannesm)
- use oUnit2 as dependency, instead of oUnit (mirage/mirage-crypto#149 @MisterDA)
- support mipsel and mips64el compilation (mirage/mirage-crypto#148 @glondu)
- bugfix: define _POSIX_C_SOURCE in entropy_cpu_stubs.c (otherwise clock_gettime
  is not defined - at least on armhf) (mirage/mirage-crypto#148 @glondu)
- bugfix: compilation on kfreebsd-* (adding __FreeBSD_kernel__ to ifdef)
  (mirage/mirage-crypto#148 @glondu)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants