Fix installing ddtrace on Debian Bookworm and Alpine 3.17 (#794)

pull/795/head 2.1.47
Michele Locati 2023-08-29 15:43:00 +02:00 committed by GitHub
parent 563d105a1e
commit dadc332bb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions

View File

@ -722,7 +722,6 @@ buildRequiredPackageLists() {
fi fi
;; ;;
ddtrace@debian) ddtrace@debian)
buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent curl"
buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libcurl4-openssl-dev" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libcurl4-openssl-dev"
if test $DISTRO_MAJMIN_VERSION -ge 1200; then if test $DISTRO_MAJMIN_VERSION -ge 1200; then
# Debian bookworm is the minimum version that comes with cargo 1.64.0+ # Debian bookworm is the minimum version that comes with cargo 1.64.0+
@ -2668,12 +2667,18 @@ installRemoteModule() {
if test $DISTRO_MAJMIN_VERSION -lt 317; then if test $DISTRO_MAJMIN_VERSION -lt 317; then
# Alpine 3.17 is the minimum version that comes with cargo 1.64.0+ # Alpine 3.17 is the minimum version that comes with cargo 1.64.0+
installRemoteModule_version=0.87.2 installRemoteModule_version=0.87.2
elif test $DISTRO_MAJMIN_VERSION -lt 318; then
# Alpine 3.18 is the minimum version that comes with cargo 1.71.0+
installRemoteModule_version=0.89.0
fi fi
;; ;;
debian) debian)
if test $DISTRO_MAJMIN_VERSION -lt 1200; then if test $DISTRO_MAJMIN_VERSION -lt 1200; then
# Debian bookworm is the minimum version that comes with cargo 1.64.0+ # Debian bookworm is the minimum version that comes with cargo 1.64.0+
installRemoteModule_version=0.87.2 installRemoteModule_version=0.87.2
elif test $DISTRO_MAJMIN_VERSION -le 1300; then
# Newer ddtrace versions require cargo 1.71.0+, but bookworm comes with cargo 1.65.0
installRemoteModule_version=0.89.0
fi fi
;; ;;
esac esac