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.

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

fix socket build; test unix target with --net=socket as well #356

Merged
merged 3 commits into from
Mar 9, 2018
Merged

fix socket build; test unix target with --net=socket as well #356

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
ff7bd2d
test unix target with --net=socket as well
yomimono Mar 2, 2018
febc5b6
attempt to fix socket stack build
yomimono Mar 2, 2018
23cf2f8
refer to tcp_socket_options without tcpip.
yomimono Mar 8, 2018
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
2 changes: 1 addition & 1 deletion .travis-ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ cd examples/unikernel
git log --oneline |head -5

opam install mirage
mirage configure -t $MIRAGE_MODE
mirage configure -t $MIRAGE_MODE $FLAGS
make depend
make
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ env:
- EXTRA_REMOTES="https://github.com/mirage/mirage-dev.git"
matrix:
- OCAML_VERSION=4.04 PACKAGE=tcpip MIRAGE_MODE=unix
- OCAML_VERSION=4.04 PACKAGE=tcpip MIRAGE_MODE=unix FLAGS="--net=socket"
- UPDATE_GCC_BINUTILS=1 OCAML_VERSION=4.04 PACKAGE=tcpip MIRAGE_MODE=xen
- UPDATE_GCC_BINUTILS=1 OCAML_VERSION=4.05 PACKAGE=tcpip MIRAGE_MODE=ukvm
- OCAML_VERSION=4.06 PACKAGE=tcpip MIRAGE_MODE=unix
15 changes: 8 additions & 7 deletions src/stack-unix/jbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@
(wrapped false)
(libraries (lwt.unix ipaddr.unix cstruct-lwt fmt mirage-protocols-lwt))))

(library
((name tcp_socket_options)
(public_name tcpip.tcp_socket_options)
(modules (tcp_socket_options))
(c_names (tcp_socket_options_stubs))
(wrapped false)
(libraries (lwt.unix duration))))

(library
((name tcpv4_socket)
(public_name tcpip.tcpv4-socket)
Expand All @@ -34,13 +42,6 @@
(wrapped false)
(libraries (lwt.unix ipaddr.unix cstruct-lwt fmt mirage-protocols mirage-protocols-lwt tcpv4_socket tcp_socket_options))))

(library
((name tcp_socket_options)
(modules (tcp_socket_options))
(c_names (tcp_socket_options_stubs))
(wrapped false)
(libraries (lwt.unix duration))))

(library
((name tcpip_stack_socket)
(public_name tcpip.stack-socket)
Expand Down