From 1de7b141992264d3ec168bd10c6f81af1d293c38 Mon Sep 17 00:00:00 2001 From: zapashcanon Date: Wed, 5 Feb 2025 18:01:47 +0100 Subject: [PATCH 01/17] add some conf packages --- packages/conf-lld/conf-lld.1/opam | 29 ++++++++++++++++++ packages/conf-rust-llvm/conf-rust-llvm.1/opam | 30 +++++++++++++++++++ packages/conf-rust-wasm/conf-rust-wasm.1/opam | 30 +++++++++++++++++++ 3 files changed, 89 insertions(+) create mode 100644 packages/conf-lld/conf-lld.1/opam create mode 100644 packages/conf-rust-llvm/conf-rust-llvm.1/opam create mode 100644 packages/conf-rust-wasm/conf-rust-wasm.1/opam diff --git a/packages/conf-lld/conf-lld.1/opam b/packages/conf-lld/conf-lld.1/opam new file mode 100644 index 00000000000..938f4f716fc --- /dev/null +++ b/packages/conf-lld/conf-lld.1/opam @@ -0,0 +1,29 @@ +opam-version: "2.0" +maintainer: "Léo Andrès " +authors: "The LLVM team" +homepage: "http://llvm.org" +bug-reports: "https://llvm.org/bugs/" +license: "MIT" +build: [ + ["wasm-ld" "-version"] +] +depends: [ + "conf-bash" {build} +] +depexts: [ + ["lld"] { os-family = "alpine" } + ["lld"] { os-family = "arch" } + ["lld"] { os-family = "debian" } + ["llvm"] { os-family = "homebrew" } + ["lld"] { os-family = "open-suse" } + ["lld"] { os-family = "suse" } + ["lld"] { os-family = "ubuntu" } + + ["lld"] { os-distribution = "centos" } + ["lld"] { os-distribution = "fedora" } + ["lld"] { os-distribution = "homebrew" } + ["lld"] { os-distribution = "nixos" } + ["lld"] { os-distribution = "ol" } +] +synopsis: "Virtual package relying on lld installation" +flags: conf diff --git a/packages/conf-rust-llvm/conf-rust-llvm.1/opam b/packages/conf-rust-llvm/conf-rust-llvm.1/opam new file mode 100644 index 00000000000..49427a67dbd --- /dev/null +++ b/packages/conf-rust-llvm/conf-rust-llvm.1/opam @@ -0,0 +1,30 @@ +opam-version: "2.0" +maintainer: "Léo Andrès " +authors: "Léo Andrès " +homepage: "https://github.com/ocaml/opam-repository" +bug-reports: "https://github.com/ocaml/opam-repository/issues" +license: "MIT" +build: [ + ["which" "rust-lld"] +] +depends: [ + "conf-bash" {build} +] +depexts: [ + ["rust-llvm"] { os-family = "alpine" } + ["rust-llvm"] { os-family = "arch" } + ["rust-llvm"] { os-family = "debian" } + ["rust-llvm"] { os-family = "homebrew" } + ["rust-llvm"] { os-family = "open-suse" } + ["rust-llvm"] { os-family = "suse" } + ["rust-llvm"] { os-family = "ubuntu" } + + ["rust-llvm"] { os-distribution = "centos" } + ["rust-llvm"] { os-distribution = "fedora" } + ["rust-llvm"] { os-distribution = "homebrew" } + ["rust-llvm"] { os-distribution = "nixos" } + ["rust-llvm"] { os-distribution = "ol" } + +] +synopsis: "Virtual package relying on an installation of the integration of Rust with LLVM tools" +flags: conf diff --git a/packages/conf-rust-wasm/conf-rust-wasm.1/opam b/packages/conf-rust-wasm/conf-rust-wasm.1/opam new file mode 100644 index 00000000000..f5d37abd5d4 --- /dev/null +++ b/packages/conf-rust-wasm/conf-rust-wasm.1/opam @@ -0,0 +1,30 @@ +opam-version: "2.0" +maintainer: "Léo Andrès " +authors: "Léo Andrès " +homepage: "https://github.com/ocaml/opam-repository" +bug-reports: "https://github.com/ocaml/opam-repository/issues" +license: "MIT" +build: [ + ["sh" "-c" "rustc --print target-list | grep -q 'wasm32-unknown-unknown'" ] +] +depends: [ + "conf-bash" {build} + "conf-rust" {build} +] +depexts: [ + ["libstd-rust-dev-wasm32"] { os-family = "alpine" } + ["libstd-rust-dev-wasm32"] { os-family = "arch" } + ["libstd-rust-dev-wasm32"] { os-family = "debian" } + ["libstd-rust-dev-wasm32"] { os-family = "homebrew" } + ["libstd-rust-dev-wasm32"] { os-family = "open-suse" } + ["libstd-rust-dev-wasm32"] { os-family = "suse" } + ["libstd-rust-dev-wasm32"] { os-family = "ubuntu" } + + ["libstd-rust-dev-wasm32"] { os-distribution = "centos" } + ["libstd-rust-dev-wasm32"] { os-distribution = "fedora" } + ["libstd-rust-dev-wasm32"] { os-distribution = "homebrew" } + ["libstd-rust-dev-wasm32"] { os-distribution = "nixos" } + ["libstd-rust-dev-wasm32"] { os-distribution = "ol" } +] +synopsis: "Virtual package relying on an installation of standard Rust libraries including development files, needed to cross-compile Rust programs to the wasm32-unknown-unknown and wasm32-wasip1/wasm32-wasip2 targets" +flags: conf From ade8fc42d775d4f86a75679427920f9dbb855803 Mon Sep 17 00:00:00 2001 From: zapashcanon Date: Thu, 6 Feb 2025 10:31:56 +0100 Subject: [PATCH 02/17] Update packages/conf-rust-llvm/conf-rust-llvm.1/opam Co-authored-by: Marcello Seri --- packages/conf-rust-llvm/conf-rust-llvm.1/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/conf-rust-llvm/conf-rust-llvm.1/opam b/packages/conf-rust-llvm/conf-rust-llvm.1/opam index 49427a67dbd..65b2982f02e 100644 --- a/packages/conf-rust-llvm/conf-rust-llvm.1/opam +++ b/packages/conf-rust-llvm/conf-rust-llvm.1/opam @@ -8,7 +8,7 @@ build: [ ["which" "rust-lld"] ] depends: [ - "conf-bash" {build} + "conf-which" {build} ] depexts: [ ["rust-llvm"] { os-family = "alpine" } From 01b7ac6a5b618756ac86d2f1dac92e52a5180c9c Mon Sep 17 00:00:00 2001 From: zapashcanon Date: Thu, 6 Feb 2025 10:32:39 +0100 Subject: [PATCH 03/17] Update packages/conf-rust-wasm/conf-rust-wasm.1/opam Co-authored-by: Marcello Seri --- packages/conf-rust-wasm/conf-rust-wasm.1/opam | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/conf-rust-wasm/conf-rust-wasm.1/opam b/packages/conf-rust-wasm/conf-rust-wasm.1/opam index f5d37abd5d4..0fae55b5454 100644 --- a/packages/conf-rust-wasm/conf-rust-wasm.1/opam +++ b/packages/conf-rust-wasm/conf-rust-wasm.1/opam @@ -8,7 +8,6 @@ build: [ ["sh" "-c" "rustc --print target-list | grep -q 'wasm32-unknown-unknown'" ] ] depends: [ - "conf-bash" {build} "conf-rust" {build} ] depexts: [ From cb2c07df041c53259f4e0ba2bf85477488adab3e Mon Sep 17 00:00:00 2001 From: zapashcanon Date: Fri, 7 Feb 2025 13:05:14 +0100 Subject: [PATCH 04/17] remove conf-bash from conf-lld deps --- packages/conf-lld/conf-lld.1/opam | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/conf-lld/conf-lld.1/opam b/packages/conf-lld/conf-lld.1/opam index 938f4f716fc..55c82c4f8a6 100644 --- a/packages/conf-lld/conf-lld.1/opam +++ b/packages/conf-lld/conf-lld.1/opam @@ -8,7 +8,6 @@ build: [ ["wasm-ld" "-version"] ] depends: [ - "conf-bash" {build} ] depexts: [ ["lld"] { os-family = "alpine" } From c9f9e0acac78dc2eacf62a334712d6ed712f289f Mon Sep 17 00:00:00 2001 From: zapashcanon Date: Fri, 7 Feb 2025 13:19:40 +0100 Subject: [PATCH 05/17] fix some depexts --- packages/conf-rust-llvm/conf-rust-llvm.1/opam | 2 +- packages/conf-rust-wasm/conf-rust-wasm.1/opam | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/conf-rust-llvm/conf-rust-llvm.1/opam b/packages/conf-rust-llvm/conf-rust-llvm.1/opam index 65b2982f02e..04fbb05a10c 100644 --- a/packages/conf-rust-llvm/conf-rust-llvm.1/opam +++ b/packages/conf-rust-llvm/conf-rust-llvm.1/opam @@ -14,7 +14,7 @@ depexts: [ ["rust-llvm"] { os-family = "alpine" } ["rust-llvm"] { os-family = "arch" } ["rust-llvm"] { os-family = "debian" } - ["rust-llvm"] { os-family = "homebrew" } + ["rustup"] { os-family = "homebrew" } ["rust-llvm"] { os-family = "open-suse" } ["rust-llvm"] { os-family = "suse" } ["rust-llvm"] { os-family = "ubuntu" } diff --git a/packages/conf-rust-wasm/conf-rust-wasm.1/opam b/packages/conf-rust-wasm/conf-rust-wasm.1/opam index 0fae55b5454..de2ed36e3c7 100644 --- a/packages/conf-rust-wasm/conf-rust-wasm.1/opam +++ b/packages/conf-rust-wasm/conf-rust-wasm.1/opam @@ -11,16 +11,16 @@ depends: [ "conf-rust" {build} ] depexts: [ - ["libstd-rust-dev-wasm32"] { os-family = "alpine" } - ["libstd-rust-dev-wasm32"] { os-family = "arch" } + ["rust-wasm"] { os-family = "alpine" } + ["rust-wasm"] { os-family = "arch" } ["libstd-rust-dev-wasm32"] { os-family = "debian" } - ["libstd-rust-dev-wasm32"] { os-family = "homebrew" } + ["llvm"] { os-family = "homebrew" } ["libstd-rust-dev-wasm32"] { os-family = "open-suse" } ["libstd-rust-dev-wasm32"] { os-family = "suse" } ["libstd-rust-dev-wasm32"] { os-family = "ubuntu" } ["libstd-rust-dev-wasm32"] { os-distribution = "centos" } - ["libstd-rust-dev-wasm32"] { os-distribution = "fedora" } + ["rust-std-static-wasm32-unknown-unknown"] { os-distribution = "fedora" } ["libstd-rust-dev-wasm32"] { os-distribution = "homebrew" } ["libstd-rust-dev-wasm32"] { os-distribution = "nixos" } ["libstd-rust-dev-wasm32"] { os-distribution = "ol" } From 486556548e03b6d6a2ec5fc5762a17de496d9221 Mon Sep 17 00:00:00 2001 From: zapashcanon Date: Fri, 7 Feb 2025 14:18:51 +0100 Subject: [PATCH 06/17] fix some depexts --- packages/conf-rust-llvm/conf-rust-llvm.1/opam | 6 +++--- packages/conf-rust-wasm/conf-rust-wasm.1/opam | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/conf-rust-llvm/conf-rust-llvm.1/opam b/packages/conf-rust-llvm/conf-rust-llvm.1/opam index 04fbb05a10c..c8acd655327 100644 --- a/packages/conf-rust-llvm/conf-rust-llvm.1/opam +++ b/packages/conf-rust-llvm/conf-rust-llvm.1/opam @@ -15,12 +15,12 @@ depexts: [ ["rust-llvm"] { os-family = "arch" } ["rust-llvm"] { os-family = "debian" } ["rustup"] { os-family = "homebrew" } - ["rust-llvm"] { os-family = "open-suse" } - ["rust-llvm"] { os-family = "suse" } + ["lld"] { os-family = "open-suse" } + ["lld"] { os-family = "suse" } ["rust-llvm"] { os-family = "ubuntu" } ["rust-llvm"] { os-distribution = "centos" } - ["rust-llvm"] { os-distribution = "fedora" } + ["lld"] { os-distribution = "fedora" } ["rust-llvm"] { os-distribution = "homebrew" } ["rust-llvm"] { os-distribution = "nixos" } ["rust-llvm"] { os-distribution = "ol" } diff --git a/packages/conf-rust-wasm/conf-rust-wasm.1/opam b/packages/conf-rust-wasm/conf-rust-wasm.1/opam index de2ed36e3c7..95648758c5b 100644 --- a/packages/conf-rust-wasm/conf-rust-wasm.1/opam +++ b/packages/conf-rust-wasm/conf-rust-wasm.1/opam @@ -15,8 +15,6 @@ depexts: [ ["rust-wasm"] { os-family = "arch" } ["libstd-rust-dev-wasm32"] { os-family = "debian" } ["llvm"] { os-family = "homebrew" } - ["libstd-rust-dev-wasm32"] { os-family = "open-suse" } - ["libstd-rust-dev-wasm32"] { os-family = "suse" } ["libstd-rust-dev-wasm32"] { os-family = "ubuntu" } ["libstd-rust-dev-wasm32"] { os-distribution = "centos" } @@ -25,5 +23,6 @@ depexts: [ ["libstd-rust-dev-wasm32"] { os-distribution = "nixos" } ["libstd-rust-dev-wasm32"] { os-distribution = "ol" } ] +available: os-distribution != "open-suse" & os-distribution != "suse" synopsis: "Virtual package relying on an installation of standard Rust libraries including development files, needed to cross-compile Rust programs to the wasm32-unknown-unknown and wasm32-wasip1/wasm32-wasip2 targets" flags: conf From eca6cb92f886eb2923e323f0613e70fbe81eec3e Mon Sep 17 00:00:00 2001 From: zapashcanon Date: Fri, 7 Feb 2025 14:26:21 +0100 Subject: [PATCH 07/17] add some freebsd packages --- packages/conf-lld/conf-lld.1/opam | 1 + packages/conf-rust-llvm/conf-rust-llvm.1/opam | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/conf-lld/conf-lld.1/opam b/packages/conf-lld/conf-lld.1/opam index 55c82c4f8a6..799fcd20cab 100644 --- a/packages/conf-lld/conf-lld.1/opam +++ b/packages/conf-lld/conf-lld.1/opam @@ -20,6 +20,7 @@ depexts: [ ["lld"] { os-distribution = "centos" } ["lld"] { os-distribution = "fedora" } + ["lld"] { os-distribution = "freebsd" } ["lld"] { os-distribution = "homebrew" } ["lld"] { os-distribution = "nixos" } ["lld"] { os-distribution = "ol" } diff --git a/packages/conf-rust-llvm/conf-rust-llvm.1/opam b/packages/conf-rust-llvm/conf-rust-llvm.1/opam index c8acd655327..2b347b6f60e 100644 --- a/packages/conf-rust-llvm/conf-rust-llvm.1/opam +++ b/packages/conf-rust-llvm/conf-rust-llvm.1/opam @@ -21,6 +21,7 @@ depexts: [ ["rust-llvm"] { os-distribution = "centos" } ["lld"] { os-distribution = "fedora" } + ["lld"] { os-distribution = "freebsd" } ["rust-llvm"] { os-distribution = "homebrew" } ["rust-llvm"] { os-distribution = "nixos" } ["rust-llvm"] { os-distribution = "ol" } From 27205550d6433aee7adde8389a71e03e1494deb9 Mon Sep 17 00:00:00 2001 From: zapashcanon Date: Fri, 7 Feb 2025 14:38:08 +0100 Subject: [PATCH 08/17] lld on freebsd --- packages/conf-lld/conf-lld.1/opam | 2 +- packages/conf-rust-llvm/conf-rust-llvm.1/opam | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/conf-lld/conf-lld.1/opam b/packages/conf-lld/conf-lld.1/opam index 799fcd20cab..9dfcd47aecd 100644 --- a/packages/conf-lld/conf-lld.1/opam +++ b/packages/conf-lld/conf-lld.1/opam @@ -20,7 +20,7 @@ depexts: [ ["lld"] { os-distribution = "centos" } ["lld"] { os-distribution = "fedora" } - ["lld"] { os-distribution = "freebsd" } + ["linux-rl9-lld"] { os-distribution = "freebsd" } ["lld"] { os-distribution = "homebrew" } ["lld"] { os-distribution = "nixos" } ["lld"] { os-distribution = "ol" } diff --git a/packages/conf-rust-llvm/conf-rust-llvm.1/opam b/packages/conf-rust-llvm/conf-rust-llvm.1/opam index 2b347b6f60e..624beacae68 100644 --- a/packages/conf-rust-llvm/conf-rust-llvm.1/opam +++ b/packages/conf-rust-llvm/conf-rust-llvm.1/opam @@ -21,7 +21,7 @@ depexts: [ ["rust-llvm"] { os-distribution = "centos" } ["lld"] { os-distribution = "fedora" } - ["lld"] { os-distribution = "freebsd" } + ["linux-rl9-lld"] { os-distribution = "freebsd" } ["rust-llvm"] { os-distribution = "homebrew" } ["rust-llvm"] { os-distribution = "nixos" } ["rust-llvm"] { os-distribution = "ol" } From cbfbdcf9d3e887a73f526dc56d46d03734200b95 Mon Sep 17 00:00:00 2001 From: zapashcanon Date: Fri, 7 Feb 2025 14:48:38 +0100 Subject: [PATCH 09/17] fix homebrew depexts --- packages/conf-lld/conf-lld.1/opam | 3 +-- packages/conf-rust-llvm/conf-rust-llvm.1/opam | 3 +-- packages/conf-rust-wasm/conf-rust-wasm.1/opam | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/conf-lld/conf-lld.1/opam b/packages/conf-lld/conf-lld.1/opam index 9dfcd47aecd..47de894e941 100644 --- a/packages/conf-lld/conf-lld.1/opam +++ b/packages/conf-lld/conf-lld.1/opam @@ -13,7 +13,6 @@ depexts: [ ["lld"] { os-family = "alpine" } ["lld"] { os-family = "arch" } ["lld"] { os-family = "debian" } - ["llvm"] { os-family = "homebrew" } ["lld"] { os-family = "open-suse" } ["lld"] { os-family = "suse" } ["lld"] { os-family = "ubuntu" } @@ -21,7 +20,7 @@ depexts: [ ["lld"] { os-distribution = "centos" } ["lld"] { os-distribution = "fedora" } ["linux-rl9-lld"] { os-distribution = "freebsd" } - ["lld"] { os-distribution = "homebrew" } + ["llvm"] { os-distribution = "homebrew" } ["lld"] { os-distribution = "nixos" } ["lld"] { os-distribution = "ol" } ] diff --git a/packages/conf-rust-llvm/conf-rust-llvm.1/opam b/packages/conf-rust-llvm/conf-rust-llvm.1/opam index 624beacae68..236214da2da 100644 --- a/packages/conf-rust-llvm/conf-rust-llvm.1/opam +++ b/packages/conf-rust-llvm/conf-rust-llvm.1/opam @@ -14,7 +14,6 @@ depexts: [ ["rust-llvm"] { os-family = "alpine" } ["rust-llvm"] { os-family = "arch" } ["rust-llvm"] { os-family = "debian" } - ["rustup"] { os-family = "homebrew" } ["lld"] { os-family = "open-suse" } ["lld"] { os-family = "suse" } ["rust-llvm"] { os-family = "ubuntu" } @@ -22,7 +21,7 @@ depexts: [ ["rust-llvm"] { os-distribution = "centos" } ["lld"] { os-distribution = "fedora" } ["linux-rl9-lld"] { os-distribution = "freebsd" } - ["rust-llvm"] { os-distribution = "homebrew" } + ["rustup" "llvm"] { distribution = "homebrew" } ["rust-llvm"] { os-distribution = "nixos" } ["rust-llvm"] { os-distribution = "ol" } diff --git a/packages/conf-rust-wasm/conf-rust-wasm.1/opam b/packages/conf-rust-wasm/conf-rust-wasm.1/opam index 95648758c5b..19c223aafc0 100644 --- a/packages/conf-rust-wasm/conf-rust-wasm.1/opam +++ b/packages/conf-rust-wasm/conf-rust-wasm.1/opam @@ -14,15 +14,13 @@ depexts: [ ["rust-wasm"] { os-family = "alpine" } ["rust-wasm"] { os-family = "arch" } ["libstd-rust-dev-wasm32"] { os-family = "debian" } - ["llvm"] { os-family = "homebrew" } ["libstd-rust-dev-wasm32"] { os-family = "ubuntu" } ["libstd-rust-dev-wasm32"] { os-distribution = "centos" } ["rust-std-static-wasm32-unknown-unknown"] { os-distribution = "fedora" } - ["libstd-rust-dev-wasm32"] { os-distribution = "homebrew" } ["libstd-rust-dev-wasm32"] { os-distribution = "nixos" } ["libstd-rust-dev-wasm32"] { os-distribution = "ol" } ] -available: os-distribution != "open-suse" & os-distribution != "suse" +available: os-distribution != "open-suse" & os-distribution != "suse" & os-distribution != "homebrew" synopsis: "Virtual package relying on an installation of standard Rust libraries including development files, needed to cross-compile Rust programs to the wasm32-unknown-unknown and wasm32-wasip1/wasm32-wasip2 targets" flags: conf From caca72200cb8e145d5631f493a4745a332b44ce3 Mon Sep 17 00:00:00 2001 From: zapashcanon Date: Fri, 7 Feb 2025 14:51:12 +0100 Subject: [PATCH 10/17] fix freebsd depexts --- packages/conf-lld/conf-lld.1/opam | 2 +- packages/conf-rust-llvm/conf-rust-llvm.1/opam | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/conf-lld/conf-lld.1/opam b/packages/conf-lld/conf-lld.1/opam index 47de894e941..87e76246717 100644 --- a/packages/conf-lld/conf-lld.1/opam +++ b/packages/conf-lld/conf-lld.1/opam @@ -19,10 +19,10 @@ depexts: [ ["lld"] { os-distribution = "centos" } ["lld"] { os-distribution = "fedora" } - ["linux-rl9-lld"] { os-distribution = "freebsd" } ["llvm"] { os-distribution = "homebrew" } ["lld"] { os-distribution = "nixos" } ["lld"] { os-distribution = "ol" } ] +available: os-distribution != "freebsd" synopsis: "Virtual package relying on lld installation" flags: conf diff --git a/packages/conf-rust-llvm/conf-rust-llvm.1/opam b/packages/conf-rust-llvm/conf-rust-llvm.1/opam index 236214da2da..213289bf93e 100644 --- a/packages/conf-rust-llvm/conf-rust-llvm.1/opam +++ b/packages/conf-rust-llvm/conf-rust-llvm.1/opam @@ -20,11 +20,11 @@ depexts: [ ["rust-llvm"] { os-distribution = "centos" } ["lld"] { os-distribution = "fedora" } - ["linux-rl9-lld"] { os-distribution = "freebsd" } ["rustup" "llvm"] { distribution = "homebrew" } ["rust-llvm"] { os-distribution = "nixos" } ["rust-llvm"] { os-distribution = "ol" } ] +available: os-distribution != "freebsd" synopsis: "Virtual package relying on an installation of the integration of Rust with LLVM tools" flags: conf From 6bb3aabf6ba5b66227c790702c860c98d1333c3b Mon Sep 17 00:00:00 2001 From: zapashcanon Date: Fri, 7 Feb 2025 15:08:32 +0100 Subject: [PATCH 11/17] fix wasm-ld build check on homebrew --- packages/conf-lld/conf-lld.1/opam | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/conf-lld/conf-lld.1/opam b/packages/conf-lld/conf-lld.1/opam index 87e76246717..77df87a92a6 100644 --- a/packages/conf-lld/conf-lld.1/opam +++ b/packages/conf-lld/conf-lld.1/opam @@ -5,7 +5,8 @@ homepage: "http://llvm.org" bug-reports: "https://llvm.org/bugs/" license: "MIT" build: [ - ["wasm-ld" "-version"] + ["wasm-ld" "-version"] { os-distribution != "homebrew" } + ["sh" "-c" "$(brew --prefix llvm)/bin/wasm-ld"] { os-distribution = "homebrew" } ] depends: [ ] From a8783a8c3c28b01bd838c7de73af756e8efd4d05 Mon Sep 17 00:00:00 2001 From: zapashcanon Date: Fri, 7 Feb 2025 15:15:56 +0100 Subject: [PATCH 12/17] fix rust-lld build check for homebrew --- packages/conf-rust-llvm/conf-rust-llvm.1/opam | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/conf-rust-llvm/conf-rust-llvm.1/opam b/packages/conf-rust-llvm/conf-rust-llvm.1/opam index 213289bf93e..c459da9c8e2 100644 --- a/packages/conf-rust-llvm/conf-rust-llvm.1/opam +++ b/packages/conf-rust-llvm/conf-rust-llvm.1/opam @@ -5,7 +5,8 @@ homepage: "https://github.com/ocaml/opam-repository" bug-reports: "https://github.com/ocaml/opam-repository/issues" license: "MIT" build: [ - ["which" "rust-lld"] + ["which" "rust-lld"] { os-distribution != "homebrew" } + ["sh" "-c" "which $(brew --prefix llvm)/bin/rust-lld"] { os-distribution = "homebrew" } ] depends: [ "conf-which" {build} From 55f5b9c3d0f766d89a7157347ec75d88c7b6b364 Mon Sep 17 00:00:00 2001 From: zapashcanon Date: Fri, 7 Feb 2025 15:21:16 +0100 Subject: [PATCH 13/17] lld fix for homebrew --- packages/conf-lld/conf-lld.1/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/conf-lld/conf-lld.1/opam b/packages/conf-lld/conf-lld.1/opam index 77df87a92a6..48cb4531d76 100644 --- a/packages/conf-lld/conf-lld.1/opam +++ b/packages/conf-lld/conf-lld.1/opam @@ -6,7 +6,7 @@ bug-reports: "https://llvm.org/bugs/" license: "MIT" build: [ ["wasm-ld" "-version"] { os-distribution != "homebrew" } - ["sh" "-c" "$(brew --prefix llvm)/bin/wasm-ld"] { os-distribution = "homebrew" } + ["sh" "-c" "$(brew --prefix llvm)/bin/lld --version"] { os-distribution = "homebrew" } ] depends: [ ] From 875c4aa3bad823405ed230845f6b3ab2280af1a1 Mon Sep 17 00:00:00 2001 From: zapashcanon Date: Fri, 7 Feb 2025 15:26:12 +0100 Subject: [PATCH 14/17] rust-llvm fix for homebrew --- packages/conf-rust-llvm/conf-rust-llvm.1/opam | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/conf-rust-llvm/conf-rust-llvm.1/opam b/packages/conf-rust-llvm/conf-rust-llvm.1/opam index c459da9c8e2..bc069ba25f5 100644 --- a/packages/conf-rust-llvm/conf-rust-llvm.1/opam +++ b/packages/conf-rust-llvm/conf-rust-llvm.1/opam @@ -6,7 +6,6 @@ bug-reports: "https://github.com/ocaml/opam-repository/issues" license: "MIT" build: [ ["which" "rust-lld"] { os-distribution != "homebrew" } - ["sh" "-c" "which $(brew --prefix llvm)/bin/rust-lld"] { os-distribution = "homebrew" } ] depends: [ "conf-which" {build} From 9555af49f65915fc432ed742b914f0094d12823b Mon Sep 17 00:00:00 2001 From: zapashcanon Date: Fri, 7 Feb 2025 15:33:17 +0100 Subject: [PATCH 15/17] fix conf-lld check for homebrew --- packages/conf-lld/conf-lld.1/opam | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/conf-lld/conf-lld.1/opam b/packages/conf-lld/conf-lld.1/opam index 48cb4531d76..1c175bedf19 100644 --- a/packages/conf-lld/conf-lld.1/opam +++ b/packages/conf-lld/conf-lld.1/opam @@ -6,7 +6,6 @@ bug-reports: "https://llvm.org/bugs/" license: "MIT" build: [ ["wasm-ld" "-version"] { os-distribution != "homebrew" } - ["sh" "-c" "$(brew --prefix llvm)/bin/lld --version"] { os-distribution = "homebrew" } ] depends: [ ] From dc4f1d90a828f2de66f27a7fbd4bf3a514559446 Mon Sep 17 00:00:00 2001 From: zapashcanon Date: Fri, 7 Feb 2025 16:15:25 +0100 Subject: [PATCH 16/17] fix depexts --- packages/conf-lld/conf-lld.1/opam | 5 +++-- packages/conf-rust-llvm/conf-rust-llvm.1/opam | 10 +++------- packages/conf-rust-wasm/conf-rust-wasm.1/opam | 2 -- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/packages/conf-lld/conf-lld.1/opam b/packages/conf-lld/conf-lld.1/opam index 1c175bedf19..37d770684c9 100644 --- a/packages/conf-lld/conf-lld.1/opam +++ b/packages/conf-lld/conf-lld.1/opam @@ -20,8 +20,9 @@ depexts: [ ["lld"] { os-distribution = "centos" } ["lld"] { os-distribution = "fedora" } ["llvm"] { os-distribution = "homebrew" } - ["lld"] { os-distribution = "nixos" } - ["lld"] { os-distribution = "ol" } +] +x-ci-accept-failures: [ + "ubuntu-20.04" # does not have wasm-ld ] available: os-distribution != "freebsd" synopsis: "Virtual package relying on lld installation" diff --git a/packages/conf-rust-llvm/conf-rust-llvm.1/opam b/packages/conf-rust-llvm/conf-rust-llvm.1/opam index bc069ba25f5..71be61d936c 100644 --- a/packages/conf-rust-llvm/conf-rust-llvm.1/opam +++ b/packages/conf-rust-llvm/conf-rust-llvm.1/opam @@ -9,21 +9,17 @@ build: [ ] depends: [ "conf-which" {build} + "conf-rust" + "conf-llvm" + "conf-lld" ] depexts: [ ["rust-llvm"] { os-family = "alpine" } ["rust-llvm"] { os-family = "arch" } ["rust-llvm"] { os-family = "debian" } - ["lld"] { os-family = "open-suse" } - ["lld"] { os-family = "suse" } ["rust-llvm"] { os-family = "ubuntu" } ["rust-llvm"] { os-distribution = "centos" } - ["lld"] { os-distribution = "fedora" } - ["rustup" "llvm"] { distribution = "homebrew" } - ["rust-llvm"] { os-distribution = "nixos" } - ["rust-llvm"] { os-distribution = "ol" } - ] available: os-distribution != "freebsd" synopsis: "Virtual package relying on an installation of the integration of Rust with LLVM tools" diff --git a/packages/conf-rust-wasm/conf-rust-wasm.1/opam b/packages/conf-rust-wasm/conf-rust-wasm.1/opam index 19c223aafc0..c34d7b68365 100644 --- a/packages/conf-rust-wasm/conf-rust-wasm.1/opam +++ b/packages/conf-rust-wasm/conf-rust-wasm.1/opam @@ -18,8 +18,6 @@ depexts: [ ["libstd-rust-dev-wasm32"] { os-distribution = "centos" } ["rust-std-static-wasm32-unknown-unknown"] { os-distribution = "fedora" } - ["libstd-rust-dev-wasm32"] { os-distribution = "nixos" } - ["libstd-rust-dev-wasm32"] { os-distribution = "ol" } ] available: os-distribution != "open-suse" & os-distribution != "suse" & os-distribution != "homebrew" synopsis: "Virtual package relying on an installation of standard Rust libraries including development files, needed to cross-compile Rust programs to the wasm32-unknown-unknown and wasm32-wasip1/wasm32-wasip2 targets" From e99762a7a891681ae0271b7d8374dcfbb54f8741 Mon Sep 17 00:00:00 2001 From: zapashcanon Date: Fri, 7 Feb 2025 19:41:51 +0100 Subject: [PATCH 17/17] fix more depexts --- packages/conf-lld/conf-lld.1/opam | 2 +- packages/conf-rust-llvm/conf-rust-llvm.1/opam | 5 +++-- packages/conf-rust-wasm/conf-rust-wasm.1/opam | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/conf-lld/conf-lld.1/opam b/packages/conf-lld/conf-lld.1/opam index 37d770684c9..d511798c132 100644 --- a/packages/conf-lld/conf-lld.1/opam +++ b/packages/conf-lld/conf-lld.1/opam @@ -13,7 +13,7 @@ depexts: [ ["lld"] { os-family = "alpine" } ["lld"] { os-family = "arch" } ["lld"] { os-family = "debian" } - ["lld"] { os-family = "open-suse" } + ["lld"] { os-family = "opensuse" } ["lld"] { os-family = "suse" } ["lld"] { os-family = "ubuntu" } diff --git a/packages/conf-rust-llvm/conf-rust-llvm.1/opam b/packages/conf-rust-llvm/conf-rust-llvm.1/opam index 71be61d936c..f9700796fd0 100644 --- a/packages/conf-rust-llvm/conf-rust-llvm.1/opam +++ b/packages/conf-rust-llvm/conf-rust-llvm.1/opam @@ -18,9 +18,10 @@ depexts: [ ["rust-llvm"] { os-family = "arch" } ["rust-llvm"] { os-family = "debian" } ["rust-llvm"] { os-family = "ubuntu" } - + ["rust-llvm"] { os-family = "opensuse" } + ["rust-llvm"] { os-family = "suse" } ["rust-llvm"] { os-distribution = "centos" } ] -available: os-distribution != "freebsd" +available: os-distribution != "freebsd" & os-distribution != "fedora" synopsis: "Virtual package relying on an installation of the integration of Rust with LLVM tools" flags: conf diff --git a/packages/conf-rust-wasm/conf-rust-wasm.1/opam b/packages/conf-rust-wasm/conf-rust-wasm.1/opam index c34d7b68365..8578fb2c0c4 100644 --- a/packages/conf-rust-wasm/conf-rust-wasm.1/opam +++ b/packages/conf-rust-wasm/conf-rust-wasm.1/opam @@ -19,6 +19,6 @@ depexts: [ ["libstd-rust-dev-wasm32"] { os-distribution = "centos" } ["rust-std-static-wasm32-unknown-unknown"] { os-distribution = "fedora" } ] -available: os-distribution != "open-suse" & os-distribution != "suse" & os-distribution != "homebrew" +available: os-family != "opensuse" & os-family != "suse" & os-distribution != "homebrew" synopsis: "Virtual package relying on an installation of standard Rust libraries including development files, needed to cross-compile Rust programs to the wasm32-unknown-unknown and wasm32-wasip1/wasm32-wasip2 targets" flags: conf