From 09cc25b7a11a9bfafc38dc1380115f34dfa9509a Mon Sep 17 00:00:00 2001 From: Brett Smith Date: Wed, 14 Aug 2024 10:16:27 -0400 Subject: [PATCH] 21363: Update install dependencies for libcurl4t64 We no longer support any distributions without libcurl4, so we can remove that branch and let this become the new default. Arvados-DCO-1.1-Signed-off-by: Brett Smith --- lib/install/deps.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/install/deps.go b/lib/install/deps.go index a64219b47f..97aefd209c 100644 --- a/lib/install/deps.go +++ b/lib/install/deps.go @@ -250,11 +250,11 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read "gnupg") // docker install recipe } switch { - case osv.Debian && osv.Major >= 10, - osv.Ubuntu && osv.Major >= 22: + case osv.Debian && osv.Major < 13, + osv.Ubuntu && osv.Major < 24: pkgs = append(pkgs, "g++", "libcurl4", "libcurl4-openssl-dev") case osv.Debian || osv.Ubuntu: - pkgs = append(pkgs, "g++", "libcurl3", "libcurl3-openssl-dev") + pkgs = append(pkgs, "g++", "libcurl4t64", "libcurl4-openssl-dev") case osv.RedHat: pkgs = append(pkgs, "gcc", "gcc-c++", "libcurl-devel", "postgresql-devel") } -- 2.30.2