From 4edea65e003b67539246eeecfe1629ba3cfe301c Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Thu, 25 Jul 2024 13:55:49 +0200 Subject: [PATCH] Make libffi version more flexible (#7734) * Make libffi version more flexible Can not install on debian 12 Fixes #6036 * target v11 packaging on v12 install we are only targeting one version per debian / ubuntu channel. This should not present a problem --- .pkgr.yml | 2 +- contrib/install.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pkgr.yml b/.pkgr.yml index 970723ef9d..405911adb4 100644 --- a/.pkgr.yml +++ b/.pkgr.yml @@ -35,7 +35,7 @@ dependencies: - gettext - nginx - jq - - libffi7 + - "libffi7 | libffi8" targets: ubuntu-20.04: true debian-11: true diff --git a/contrib/install.sh b/contrib/install.sh index 3b432ae366..fc6b005960 100755 --- a/contrib/install.sh +++ b/contrib/install.sh @@ -75,6 +75,7 @@ root_command() { ;; "Debian GNU/Linux" | "debian gnu/linux" | Raspbian) if [[ $VER == "12" ]]; then + DIST_VER="11" SUPPORTED=true elif [[ $VER == "11" ]]; then SUPPORTED=true