From 48f3c5eb4084aea3e67592553eaba1eec48339a4 Mon Sep 17 00:00:00 2001 From: Simon Wright Date: Wed, 1 Nov 2023 11:51:54 +0000 Subject: [PATCH 1/2] Don't look for gprbuild from system provider. Because the manifest currently asks for Alire to attempt to download gprbuild from the system package manager, alr spends several fruitless seconds trying to find gprbuild. * index/gp/gprbuild/gprbuild-external.toml: remove the 'system' external. --- index/gp/gprbuild/gprbuild-external.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/index/gp/gprbuild/gprbuild-external.toml b/index/gp/gprbuild/gprbuild-external.toml index 301a80eb2..ebd77373d 100644 --- a/index/gp/gprbuild/gprbuild-external.toml +++ b/index/gp/gprbuild/gprbuild-external.toml @@ -9,6 +9,3 @@ kind = "version-output" version-regexp = "^GPRBUILD ([\\d\\.-]+).*|^GPRBUILD Community ([\\d\\.-]+).*" version-command = ["gprbuild", "--version"] -[[external]] -kind = "system" -origin = ["gprbuild"] From 4a0d19bfc75b76acd157e99b105b88b28ab30ade Mon Sep 17 00:00:00 2001 From: Simon Wright Date: Thu, 9 Nov 2023 12:18:23 +0000 Subject: [PATCH 2/2] macOS distributions don't provide gprbuild, others do. * index/gp/gprbuild/gprbuild-external.toml: the "system" external isn't available on macOS, so specify it explicitly for the other operating systems. --- index/gp/gprbuild/gprbuild-external.toml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/index/gp/gprbuild/gprbuild-external.toml b/index/gp/gprbuild/gprbuild-external.toml index ebd77373d..cd347dfb4 100644 --- a/index/gp/gprbuild/gprbuild-external.toml +++ b/index/gp/gprbuild/gprbuild-external.toml @@ -9,3 +9,10 @@ kind = "version-output" version-regexp = "^GPRBUILD ([\\d\\.-]+).*|^GPRBUILD Community ([\\d\\.-]+).*" version-command = ["gprbuild", "--version"] +# Neither macOS distribution (Homebrew, MacPorts) provides gprbuild. +[[external]] +kind = "system" +[external.origin.'case(os)'] +"freebsd" = ["gprbuild"] +"linux" = ["gprbuild"] +"windows" = ["gprbuild"]