diff --git a/META.tcpip.template b/META.tcpip.template deleted file mode 100644 index 8fab21c4..00000000 --- a/META.tcpip.template +++ /dev/null @@ -1,3 +0,0 @@ -# DUNE_GEN - -freestanding_linkopts = "-l:libtcpip_freestanding_stubs.a" diff --git a/freestanding/Makefile b/freestanding/Makefile deleted file mode 100644 index 490f57c8..00000000 --- a/freestanding/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -ifneq (, $(shell command -v opam)) - ifeq ($(origin PKG_CONFIG_PATH), undefined) - PKG_CONFIG_PATH := $(shell opam var prefix)/lib/pkgconfig - endif -endif - -ifeq ($(OS), Windows_NT) - ifneq (, $(shell command -v cygpath)) - PKG_CONFIG_PATH := $(shell cygpath --unix --path "$(PKG_CONFIG_PATH)") - endif -endif - -EXISTS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --exists ocaml-freestanding; echo $$?) - -.PHONY: all clean -all: libtcpip_freestanding_stubs.a - -ifeq ($(EXISTS), 1) -libtcpip_freestanding_stubs.a: - touch $@ -else -CC ?= cc -FREESTANDING_CFLAGS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags ocaml-freestanding) -CFLAGS := $(FREESTANDING_CFLAGS) - -OBJS=checksum_stubs.o - -libtcpip_freestanding_stubs.a: $(OBJS) - $(AR) r $@ $^ -endif - -clean: - $(RM) $(OBJS) libtcpip_freestanding_stubs.a diff --git a/freestanding/dune b/freestanding/dune deleted file mode 100644 index 778ffc21..00000000 --- a/freestanding/dune +++ /dev/null @@ -1,14 +0,0 @@ -(copy_files# ../src/tcpip_checksum/*.c) - -(rule - (deps Makefile checksum_stubs.c) - (targets libtcpip_freestanding_stubs.a) - (action - (no-infer - (progn - (run %{make}))))) - -(install - (package tcpip) - (section lib) - (files libtcpip_freestanding_stubs.a)) diff --git a/tcpip.opam b/tcpip.opam index ce411cb1..dd94c69a 100644 --- a/tcpip.opam +++ b/tcpip.opam @@ -19,11 +19,10 @@ build: [ ] conflicts: [ "mirage-xen" {< "6.0.0"} - "ocaml-freestanding" {< "0.4.1"} + "ocaml-freestanding" "result" {< "1.5"} ] depends: [ - "conf-pkg-config" {build} "dune" {>= "2.7.0"} "bisect_ppx" {dev & >= "2.5.0"} "ocaml" {>= "4.08.0"} @@ -56,9 +55,6 @@ depends: [ "metrics" "cmdliner" {>= "1.1.0"} ] -depopts: [ - "ocaml-freestanding" -] synopsis: "OCaml TCP/IP networking stack, used in MirageOS" description: """ `mirage-tcpip` provides a networking stack for the [Mirage operating