Skip to content

Commit

Permalink
solo5-bindings-* need conf-gcc
Browse files Browse the repository at this point in the history
Also old versions have a broken configure.sh on gcc>=10 so are
not selected by default using the new 'avoid-version' flag
available in opam 2.1.
  • Loading branch information
samoht committed Oct 13, 2021
1 parent 542cab3 commit 2719bc9
Show file tree
Hide file tree
Showing 40 changed files with 94 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ dev-repo: "git+https://github.com/solo5/solo5.git"
build: [make "genode"]
install: [make "opam-genode-install" "PREFIX=%{prefix}%"]
remove: [make "opam-genode-uninstall" "PREFIX=%{prefix}%"]
depends: "conf-pkg-config"
depends: [
"conf-pkg-config"
"conf-gcc"
]
conflicts: [
"solo5-bindings-hvt"
"solo5-bindings-muen"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ remove: [
["touch" "./Makeconf"]
[make "V=1" "uninstall-opam-genode" "PREFIX=%{prefix}%"]
]
depends: "conf-pkg-config"
depends: [
"conf-pkg-config"
"conf-gcc"
]
conflicts: [
"solo5-bindings-hvt"
"solo5-bindings-spt"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ remove: [
depends: [
"conf-pkg-config"
"conf-libseccomp" {build & os = "linux"}
"conf-gcc"
]
conflicts: [
"solo5-bindings-hvt"
Expand Down
6 changes: 5 additions & 1 deletion packages/solo5-bindings-hvt/solo5-bindings-hvt.0.4.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ dev-repo: "git+https://github.com/solo5/solo5.git"
build: [make "hvt"]
install: [make "opam-hvt-install" "PREFIX=%{prefix}%"]
remove: [make "opam-hvt-uninstall" "PREFIX=%{prefix}%"]
depends: "conf-pkg-config"
depends: [
"conf-pkg-config"
"conf-gcc"
]
flags: avoid-version # ./configure.sh is broken for gcc>=10
x-ci-accept-failures: ["debian-unstable"]
depexts: [
["linux-headers"] {os-distribution = "alpine"}
Expand Down
6 changes: 5 additions & 1 deletion packages/solo5-bindings-hvt/solo5-bindings-hvt.0.4.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ dev-repo: "git+https://github.com/solo5/solo5.git"
build: [make "hvt"]
install: [make "opam-hvt-install" "PREFIX=%{prefix}%"]
remove: [make "opam-hvt-uninstall" "PREFIX=%{prefix}%"]
depends: "conf-pkg-config"
depends: [
"conf-pkg-config"
"conf-gcc"
]
flags: avoid-version # ./configure.sh is broken for gcc>=10
x-ci-accept-failures: ["debian-unstable"]
depexts: [
["linux-headers"] {os-distribution = "alpine"}
Expand Down
6 changes: 5 additions & 1 deletion packages/solo5-bindings-hvt/solo5-bindings-hvt.0.6.2/opam
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ remove: [
["touch" "./Makeconf"]
[make "V=1" "uninstall-opam-hvt" "PREFIX=%{prefix}%"]
]
depends: "conf-pkg-config"
depends: [
"conf-pkg-config"
"conf-gcc"
]
flags: avoid-version # ./configure.sh is broken for gcc>=10
x-ci-accept-failures: ["debian-unstable"]
depexts: [
["linux-headers"] {os-distribution = "alpine"}
Expand Down
2 changes: 2 additions & 0 deletions packages/solo5-bindings-hvt/solo5-bindings-hvt.0.6.3/opam
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ x-ci-accept-failures: ["debian-unstable"]
depends: [
"conf-pkg-config"
"conf-libseccomp" {build & os = "linux"}
"conf-gcc"
]
flags: avoid-version # ./configure.sh is broken for gcc>=10
depexts: [
["linux-headers"] {os-distribution = "alpine"}
["linux-libc-dev"] {os-family = "debian"}
Expand Down
2 changes: 2 additions & 0 deletions packages/solo5-bindings-hvt/solo5-bindings-hvt.0.6.4/opam
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ x-ci-accept-failures: ["debian-unstable"]
depends: [
"conf-pkg-config"
"conf-libseccomp" {build & os = "linux"}
"conf-gcc"
]
flags: avoid-version # ./configure.sh is broken for gcc>=10
depexts: [
["linux-headers"] {os-distribution = "alpine"}
["linux-libc-dev"] {os-distribution = "debian"}
Expand Down
1 change: 1 addition & 0 deletions packages/solo5-bindings-hvt/solo5-bindings-hvt.0.6.5/opam
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ install: [make "V=1" "CONFIG_SPT=" "CONFIG_VIRTIO=" "CONFIG_MUEN=" "CONFIG_GENOD
depends: [
"conf-pkg-config"
"conf-libseccomp" {build & os = "linux"}
"conf-gcc"
]
depexts: [
["linux-headers"] {os-distribution = "alpine"}
Expand Down
1 change: 1 addition & 0 deletions packages/solo5-bindings-hvt/solo5-bindings-hvt.0.6.6/opam
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ install: [make "V=1" "CONFIG_SPT=" "CONFIG_VIRTIO=" "CONFIG_MUEN=" "CONFIG_GENOD
depends: [
"conf-pkg-config"
"conf-libseccomp" {build & os = "linux"}
"conf-gcc"
]
depexts: [
["linux-headers"] {os-distribution = "alpine"}
Expand Down
1 change: 1 addition & 0 deletions packages/solo5-bindings-hvt/solo5-bindings-hvt.0.6.7/opam
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ install: [make "V=1" "CONFIG_SPT=" "CONFIG_VIRTIO=" "CONFIG_MUEN=" "CONFIG_GENOD
depends: [
"conf-pkg-config"
"conf-libseccomp" {build & os = "linux"}
"conf-gcc"
]
depexts: [
["linux-headers"] {os-distribution = "alpine"}
Expand Down
1 change: 1 addition & 0 deletions packages/solo5-bindings-hvt/solo5-bindings-hvt.0.6.8/opam
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ install: [make "V=1" "CONFIG_SPT=" "CONFIG_VIRTIO=" "CONFIG_MUEN=" "CONFIG_GENOD
depends: [
"conf-pkg-config"
"conf-libseccomp" {build & os = "linux"}
"conf-gcc"
]
depexts: [
["linux-headers"] {os-distribution = "alpine"}
Expand Down
6 changes: 5 additions & 1 deletion packages/solo5-bindings-muen/solo5-bindings-muen.0.4.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ build: [make "muen"]
install: [make "opam-muen-install" "PREFIX=%{prefix}%"]
remove: [make "opam-muen-uninstall" "PREFIX=%{prefix}%"]
x-ci-accept-failures: ["debian-unstable"]
depends: "conf-pkg-config"
depends: [
"conf-pkg-config"
"conf-gcc"
]
flags: avoid-version # ./configure.sh is broken for gcc>=10
conflicts: [
"solo5-bindings-genode"
"solo5-bindings-hvt"
Expand Down
6 changes: 5 additions & 1 deletion packages/solo5-bindings-muen/solo5-bindings-muen.0.4.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ build: [make "muen"]
install: [make "opam-muen-install" "PREFIX=%{prefix}%"]
remove: [make "opam-muen-uninstall" "PREFIX=%{prefix}%"]
x-ci-accept-failures: ["debian-unstable"]
depends: "conf-pkg-config"
depends: [
"conf-pkg-config"
"conf-gcc"
]
flags: avoid-version # ./configure.sh is broken for gcc>=10
conflicts: [
"solo5-bindings-genode"
"solo5-bindings-hvt"
Expand Down
6 changes: 5 additions & 1 deletion packages/solo5-bindings-muen/solo5-bindings-muen.0.6.2/opam
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ remove: [
[make "V=1" "uninstall-opam-muen" "PREFIX=%{prefix}%"]
]
x-ci-accept-failures: ["debian-unstable"]
depends: "conf-pkg-config"
depends: [
"conf-pkg-config"
"conf-gcc"
]
flags: avoid-version # ./configure.sh is broken for gcc>=10
conflicts: [
"solo5-bindings-genode"
"solo5-bindings-hvt"
Expand Down
2 changes: 2 additions & 0 deletions packages/solo5-bindings-muen/solo5-bindings-muen.0.6.3/opam
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ x-ci-accept-failures: ["debian-unstable"]
depends: [
"conf-pkg-config"
"conf-libseccomp" {build & os = "linux"}
"conf-gcc"
]
flags: avoid-version # ./configure.sh is broken for gcc>=10
conflicts: [
"solo5-bindings-genode"
"solo5-bindings-hvt"
Expand Down
2 changes: 2 additions & 0 deletions packages/solo5-bindings-muen/solo5-bindings-muen.0.6.4/opam
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ x-ci-accept-failures: ["debian-unstable"]
depends: [
"conf-pkg-config"
"conf-libseccomp" {build & os = "linux"}
"conf-gcc"
]
flags: avoid-version # ./configure.sh is broken for gcc>=10
conflicts: [
"solo5-bindings-genode"
"solo5-bindings-hvt"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ install: [make "V=1" "CONFIG_HVT=" "CONFIG_SPT=" "CONFIG_VIRTIO=" "CONFIG_GENODE
depends: [
"conf-pkg-config"
"conf-libseccomp" {build & os = "linux"}
"conf-gcc"
]
conflicts: [
"ocaml-freestanding" {< "0.6.0"}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ install: [make "V=1" "CONFIG_HVT=" "CONFIG_SPT=" "CONFIG_VIRTIO=" "CONFIG_GENODE
depends: [
"conf-pkg-config"
"conf-libseccomp" {build & os = "linux"}
"conf-gcc"
]
conflicts: [
"ocaml-freestanding" {< "0.6.0"}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ install: [make "V=1" "CONFIG_HVT=" "CONFIG_SPT=" "CONFIG_VIRTIO=" "CONFIG_GENODE
depends: [
"conf-pkg-config"
"conf-libseccomp" {build & os = "linux"}
"conf-gcc"
]
conflicts: [
"ocaml-freestanding" {< "0.6.0"}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ install: [make "V=1" "CONFIG_HVT=" "CONFIG_SPT=" "CONFIG_VIRTIO=" "CONFIG_GENODE
depends: [
"conf-pkg-config"
"conf-libseccomp" {build & os = "linux"}
"conf-gcc"
]
conflicts: [
"ocaml-freestanding" {< "0.6.0"}
Expand Down
6 changes: 5 additions & 1 deletion packages/solo5-bindings-spt/solo5-bindings-spt.0.6.2/opam
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ remove: [
[make "V=1" "uninstall-opam-spt" "PREFIX=%{prefix}%"]
]
x-ci-accept-failures: ["debian-unstable"]
depends: "conf-pkg-config"
depends: [
"conf-pkg-config"
"conf-gcc"
]
flags: avoid-version # ./configure.sh is broken for gcc>=10
depexts: [
["linux-headers"] {os-distribution = "alpine"}
["linux-libc-dev"] {os-family = "debian"}
Expand Down
2 changes: 2 additions & 0 deletions packages/solo5-bindings-spt/solo5-bindings-spt.0.6.3/opam
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ x-ci-accept-failures: ["debian-unstable"]
depends: [
"conf-pkg-config"
"conf-libseccomp" {os = "linux"}
"conf-gcc"
]
flags: avoid-version # ./configure.sh is broken for gcc>=10
depexts: [
["linux-headers"] {os-distribution = "alpine"}
["linux-libc-dev"] {os-family = "debian"}
Expand Down
2 changes: 2 additions & 0 deletions packages/solo5-bindings-spt/solo5-bindings-spt.0.6.4/opam
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ x-ci-accept-failures: ["debian-unstable"]
depends: [
"conf-pkg-config"
"conf-libseccomp" {os = "linux"}
"conf-gcc"
]
flags: avoid-version # ./configure.sh is broken for gcc>=10
depexts: [
["linux-headers"] {os-distribution = "alpine"}
["linux-libc-dev"] {os-distribution = "debian"}
Expand Down
1 change: 1 addition & 0 deletions packages/solo5-bindings-spt/solo5-bindings-spt.0.6.5/opam
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ install: [make "V=1" "CONFIG_HVT=" "CONFIG_VIRTIO=" "CONFIG_MUEN=" "CONFIG_GENOD
depends: [
"conf-pkg-config"
"conf-libseccomp" {os = "linux"}
"conf-gcc"
]
depexts: [
["linux-headers"] {os-distribution = "alpine"}
Expand Down
1 change: 1 addition & 0 deletions packages/solo5-bindings-spt/solo5-bindings-spt.0.6.6/opam
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ install: [make "V=1" "CONFIG_HVT=" "CONFIG_VIRTIO=" "CONFIG_MUEN=" "CONFIG_GENOD
depends: [
"conf-pkg-config"
"conf-libseccomp" {os = "linux"}
"conf-gcc"
]
depexts: [
["linux-headers"] {os-distribution = "alpine"}
Expand Down
1 change: 1 addition & 0 deletions packages/solo5-bindings-spt/solo5-bindings-spt.0.6.7/opam
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ install: [make "V=1" "CONFIG_HVT=" "CONFIG_VIRTIO=" "CONFIG_MUEN=" "CONFIG_GENOD
depends: [
"conf-pkg-config"
"conf-libseccomp" {os = "linux"}
"conf-gcc"
]
depexts: [
["linux-headers"] {os-distribution = "alpine"}
Expand Down
1 change: 1 addition & 0 deletions packages/solo5-bindings-spt/solo5-bindings-spt.0.6.8/opam
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ install: [make "V=1" "CONFIG_HVT=" "CONFIG_VIRTIO=" "CONFIG_MUEN=" "CONFIG_GENOD
depends: [
"conf-pkg-config"
"conf-libseccomp" {os = "linux"}
"conf-gcc"
]
depexts: [
["linux-headers"] {os-distribution = "alpine"}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ build: [make "virtio"]
install: [make "opam-virtio-install" "PREFIX=%{prefix}%"]
remove: [make "opam-virtio-uninstall" "PREFIX=%{prefix}%"]
x-ci-accept-failures: ["debian-unstable"]
depends: "conf-pkg-config"
depends: [
"conf-pkg-config"
"conf-gcc"
]
flags: avoid-version # ./configure.sh is broken for gcc>=10
conflicts: [
"solo5-bindings-genode"
"solo5-bindings-hvt"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ build: [make "virtio"]
install: [make "opam-virtio-install" "PREFIX=%{prefix}%"]
remove: [make "opam-virtio-uninstall" "PREFIX=%{prefix}%"]
x-ci-accept-failures: ["debian-unstable"]
depends: "conf-pkg-config"
depends: [
"conf-pkg-config"
"conf-gcc"
]
flags: avoid-version # ./configure.sh is broken for gcc>=10
conflicts: [
"solo5-bindings-genode"
"solo5-bindings-hvt"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ remove: [
[make "V=1" "uninstall-opam-virtio" "PREFIX=%{prefix}%"]
]
x-ci-accept-failures: ["debian-unstable"]
depends: "conf-pkg-config"
depends: [
"conf-pkg-config"
"conf-gcc"
]
flags: avoid-version # ./configure.sh is broken for gcc>=10
conflicts: [
"solo5-bindings-hvt"
"solo5-bindings-spt"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ x-ci-accept-failures: ["debian-unstable"]
depends: [
"conf-pkg-config"
"conf-libseccomp" {build & os = "linux"}
"conf-gcc"
]
flags: avoid-version # ./configure.sh is broken for gcc>=10
conflicts: [
"solo5-bindings-hvt"
"solo5-bindings-spt"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ x-ci-accept-failures: ["debian-unstable"]
depends: [
"conf-pkg-config"
"conf-libseccomp" {build & os = "linux"}
"conf-gcc"
]
flags: avoid-version # ./configure.sh is broken for gcc>=10
conflicts: [
"solo5-bindings-hvt"
"solo5-bindings-spt"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ install: [make "V=1" "CONFIG_HVT=" "CONFIG_SPT=" "CONFIG_MUEN=" "CONFIG_GENODE="
depends: [
"conf-pkg-config"
"conf-libseccomp" {build & os = "linux"}
"conf-gcc"
]
conflicts: [
"ocaml-freestanding" {< "0.6.0"}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ install: [make "V=1" "CONFIG_HVT=" "CONFIG_SPT=" "CONFIG_MUEN=" "CONFIG_GENODE="
depends: [
"conf-pkg-config"
"conf-libseccomp" {build & os = "linux"}
"conf-gcc"
]
conflicts: [
"ocaml-freestanding" {< "0.6.0"}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ install: [make "V=1" "CONFIG_HVT=" "CONFIG_SPT=" "CONFIG_MUEN=" "CONFIG_GENODE="
depends: [
"conf-pkg-config"
"conf-libseccomp" {build & os = "linux"}
"conf-gcc"
]
conflicts: [
"ocaml-freestanding" {< "0.6.0"}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ install: [make "V=1" "CONFIG_HVT=" "CONFIG_SPT=" "CONFIG_MUEN=" "CONFIG_GENODE="
depends: [
"conf-pkg-config"
"conf-libseccomp" {build & os = "linux"}
"conf-gcc"
]
conflicts: [
"ocaml-freestanding" {< "0.6.0"}
Expand Down
1 change: 1 addition & 0 deletions packages/solo5-bindings-xen/solo5-bindings-xen.0.6.6/opam
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ install: [make "V=1" "CONFIG_HVT=" "CONFIG_SPT=" "CONFIG_VIRTIO=" "CONFIG_MUEN="
depends: [
"conf-pkg-config"
"conf-libseccomp" {build & os = "linux"}
"conf-gcc"
]
conflicts: [
"ocaml-freestanding" {< "0.6.0"}
Expand Down
1 change: 1 addition & 0 deletions packages/solo5-bindings-xen/solo5-bindings-xen.0.6.7/opam
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ install: [make "V=1" "CONFIG_HVT=" "CONFIG_SPT=" "CONFIG_VIRTIO=" "CONFIG_MUEN="
depends: [
"conf-pkg-config"
"conf-libseccomp" {build & os = "linux"}
"conf-gcc"
]
conflicts: [
"ocaml-freestanding" {< "0.6.0"}
Expand Down
1 change: 1 addition & 0 deletions packages/solo5-bindings-xen/solo5-bindings-xen.0.6.8/opam
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ install: [make "V=1" "CONFIG_HVT=" "CONFIG_SPT=" "CONFIG_VIRTIO=" "CONFIG_MUEN="
depends: [
"conf-pkg-config"
"conf-libseccomp" {build & os = "linux"}
"conf-gcc"
]
conflicts: [
"ocaml-freestanding" {< "0.6.0"}
Expand Down

0 comments on commit 2719bc9

Please sign in to comment.