solo5-bindings-* needs conf-gcc

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.
ocaml · Oct 13, 2021 · d4c9d7c · d4c9d7c
1 parent 542cab3
commit d4c9d7c
Show file tree

Hide file tree

Showing 40 changed files with 112 additions and 30 deletions.
diff --git a/packages/solo5-bindings-genode/solo5-bindings-genode.0.4.1/opam b/packages/solo5-bindings-genode/solo5-bindings-genode.0.4.1/opam
@@ -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"

diff --git a/packages/solo5-bindings-genode/solo5-bindings-genode.0.6.2/opam b/packages/solo5-bindings-genode/solo5-bindings-genode.0.6.2/opam
@@ -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"

diff --git a/packages/solo5-bindings-genode/solo5-bindings-genode.0.6.3/opam b/packages/solo5-bindings-genode/solo5-bindings-genode.0.6.3/opam
@@ -19,6 +19,7 @@ remove: [
 depends: [
   "conf-pkg-config"
   "conf-libseccomp" {build & os = "linux"}
+  "conf-gcc"
 ]
 conflicts: [
   "solo5-bindings-hvt"

diff --git a/packages/solo5-bindings-hvt/solo5-bindings-hvt.0.4.0/opam b/packages/solo5-bindings-hvt/solo5-bindings-hvt.0.4.0/opam
@@ -1,4 +1,4 @@
-opam-version: "2.0"
+opam-version: "2.1"
 maintainer: "martin@lucina.net"
 authors: [
   "Dan Williams <djwillia@us.ibm.com>"
@@ -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"}

diff --git a/packages/solo5-bindings-hvt/solo5-bindings-hvt.0.4.1/opam b/packages/solo5-bindings-hvt/solo5-bindings-hvt.0.4.1/opam
@@ -1,4 +1,4 @@
-opam-version: "2.0"
+opam-version: "2.1"
 maintainer: "martin@lucina.net"
 authors: [
   "Dan Williams <djwillia@us.ibm.com>"
@@ -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"}

diff --git a/packages/solo5-bindings-hvt/solo5-bindings-hvt.0.6.2/opam b/packages/solo5-bindings-hvt/solo5-bindings-hvt.0.6.2/opam
@@ -1,4 +1,4 @@
-opam-version: "2.0"
+opam-version: "2.1"
 maintainer: "martin@lucina.net"
 authors: [
   "Dan Williams <djwillia@us.ibm.com>"
@@ -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"}

diff --git a/packages/solo5-bindings-hvt/solo5-bindings-hvt.0.6.3/opam b/packages/solo5-bindings-hvt/solo5-bindings-hvt.0.6.3/opam
@@ -1,4 +1,4 @@
-opam-version: "2.0"
+opam-version: "2.1"
 maintainer: "martin@lucina.net"
 authors: [
   "Dan Williams <djwillia@us.ibm.com>"
@@ -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"}

diff --git a/packages/solo5-bindings-hvt/solo5-bindings-hvt.0.6.4/opam b/packages/solo5-bindings-hvt/solo5-bindings-hvt.0.6.4/opam
@@ -1,4 +1,4 @@
-opam-version: "2.0"
+opam-version: "2.1"
 maintainer: "martin@lucina.net"
 authors: [
   "Dan Williams <djwillia@us.ibm.com>"
@@ -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"}

diff --git a/packages/solo5-bindings-hvt/solo5-bindings-hvt.0.6.5/opam b/packages/solo5-bindings-hvt/solo5-bindings-hvt.0.6.5/opam
@@ -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"}

diff --git a/packages/solo5-bindings-hvt/solo5-bindings-hvt.0.6.6/opam b/packages/solo5-bindings-hvt/solo5-bindings-hvt.0.6.6/opam
@@ -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"}

diff --git a/packages/solo5-bindings-hvt/solo5-bindings-hvt.0.6.7/opam b/packages/solo5-bindings-hvt/solo5-bindings-hvt.0.6.7/opam
@@ -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"}

diff --git a/packages/solo5-bindings-hvt/solo5-bindings-hvt.0.6.8/opam b/packages/solo5-bindings-hvt/solo5-bindings-hvt.0.6.8/opam
@@ -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"}

diff --git a/packages/solo5-bindings-muen/solo5-bindings-muen.0.4.0/opam b/packages/solo5-bindings-muen/solo5-bindings-muen.0.4.0/opam
@@ -1,4 +1,4 @@
-opam-version: "2.0"
+opam-version: "2.1"
 maintainer: "martin@lucina.net"
 authors: [
   "Dan Williams <djwillia@us.ibm.com>"
@@ -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"

diff --git a/packages/solo5-bindings-muen/solo5-bindings-muen.0.4.1/opam b/packages/solo5-bindings-muen/solo5-bindings-muen.0.4.1/opam
@@ -1,4 +1,4 @@
-opam-version: "2.0"
+opam-version: "2.1"
 maintainer: "martin@lucina.net"
 authors: [
   "Dan Williams <djwillia@us.ibm.com>"
@@ -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"

diff --git a/packages/solo5-bindings-muen/solo5-bindings-muen.0.6.2/opam b/packages/solo5-bindings-muen/solo5-bindings-muen.0.6.2/opam
@@ -1,4 +1,4 @@
-opam-version: "2.0"
+opam-version: "2.1"
 maintainer: "martin@lucina.net"
 authors: [
   "Dan Williams <djwillia@us.ibm.com>"
@@ -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"

diff --git a/packages/solo5-bindings-muen/solo5-bindings-muen.0.6.3/opam b/packages/solo5-bindings-muen/solo5-bindings-muen.0.6.3/opam
@@ -1,4 +1,4 @@
-opam-version: "2.0"
+opam-version: "2.1"
 maintainer: "martin@lucina.net"
 authors: [
   "Dan Williams <djwillia@us.ibm.com>"
@@ -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"

diff --git a/packages/solo5-bindings-muen/solo5-bindings-muen.0.6.4/opam b/packages/solo5-bindings-muen/solo5-bindings-muen.0.6.4/opam
@@ -1,4 +1,4 @@
-opam-version: "2.0"
+opam-version: "2.1"
 maintainer: "martin@lucina.net"
 authors: [
   "Dan Williams <djwillia@us.ibm.com>"
@@ -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"

diff --git a/packages/solo5-bindings-muen/solo5-bindings-muen.0.6.5/opam b/packages/solo5-bindings-muen/solo5-bindings-muen.0.6.5/opam
@@ -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"}

diff --git a/packages/solo5-bindings-muen/solo5-bindings-muen.0.6.6/opam b/packages/solo5-bindings-muen/solo5-bindings-muen.0.6.6/opam
@@ -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"}

diff --git a/packages/solo5-bindings-muen/solo5-bindings-muen.0.6.7/opam b/packages/solo5-bindings-muen/solo5-bindings-muen.0.6.7/opam
@@ -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"}

diff --git a/packages/solo5-bindings-muen/solo5-bindings-muen.0.6.8/opam b/packages/solo5-bindings-muen/solo5-bindings-muen.0.6.8/opam
@@ -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"}

diff --git a/packages/solo5-bindings-spt/solo5-bindings-spt.0.6.2/opam b/packages/solo5-bindings-spt/solo5-bindings-spt.0.6.2/opam
@@ -1,4 +1,4 @@
-opam-version: "2.0"
+opam-version: "2.1"
 maintainer: "martin@lucina.net"
 authors: [
   "Dan Williams <djwillia@us.ibm.com>"
@@ -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"}

diff --git a/packages/solo5-bindings-spt/solo5-bindings-spt.0.6.3/opam b/packages/solo5-bindings-spt/solo5-bindings-spt.0.6.3/opam
@@ -1,4 +1,4 @@
-opam-version: "2.0"
+opam-version: "2.1"
 maintainer: "martin@lucina.net"
 authors: [
   "Dan Williams <djwillia@us.ibm.com>"
@@ -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"}

diff --git a/packages/solo5-bindings-spt/solo5-bindings-spt.0.6.4/opam b/packages/solo5-bindings-spt/solo5-bindings-spt.0.6.4/opam
@@ -1,4 +1,4 @@
-opam-version: "2.0"
+opam-version: "2.1"
 maintainer: "martin@lucina.net"
 authors: [
   "Dan Williams <djwillia@us.ibm.com>"
@@ -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"}

diff --git a/packages/solo5-bindings-spt/solo5-bindings-spt.0.6.5/opam b/packages/solo5-bindings-spt/solo5-bindings-spt.0.6.5/opam
@@ -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"}

diff --git a/packages/solo5-bindings-spt/solo5-bindings-spt.0.6.6/opam b/packages/solo5-bindings-spt/solo5-bindings-spt.0.6.6/opam
@@ -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"}

diff --git a/packages/solo5-bindings-spt/solo5-bindings-spt.0.6.7/opam b/packages/solo5-bindings-spt/solo5-bindings-spt.0.6.7/opam
@@ -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"}

diff --git a/packages/solo5-bindings-spt/solo5-bindings-spt.0.6.8/opam b/packages/solo5-bindings-spt/solo5-bindings-spt.0.6.8/opam
@@ -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"}

diff --git a/packages/solo5-bindings-virtio/solo5-bindings-virtio.0.4.0/opam b/packages/solo5-bindings-virtio/solo5-bindings-virtio.0.4.0/opam
@@ -1,4 +1,4 @@
-opam-version: "2.0"
+opam-version: "2.1"
 maintainer: "martin@lucina.net"
 authors: [
   "Dan Williams <djwillia@us.ibm.com>"
@@ -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"

diff --git a/packages/solo5-bindings-virtio/solo5-bindings-virtio.0.4.1/opam b/packages/solo5-bindings-virtio/solo5-bindings-virtio.0.4.1/opam
@@ -1,4 +1,4 @@
-opam-version: "2.0"
+opam-version: "2.1"
 maintainer: "martin@lucina.net"
 authors: [
   "Dan Williams <djwillia@us.ibm.com>"
@@ -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"